elwix/build_fs.sh - diff

Return to build_fs.sh CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / elwix

Diff for /elwix/build_fs.sh between versions 1.3.2.16 and 1.10.2.4

-version 1.3.2.16, 2012/10/11 13:51:22
+version 1.10.2.4, 2016/12/21 13:20:54
  Line 32  fi
  clean_fsdir()
  {
-        echo "+++ Clean ELWIX FS ..."
+        echo "+++ Clean ELWIX FS ... $1"
-        rm -rf ${FS} ${FS_LITE}
+        chflags -Rf nosunlink $1
+        rm -rf $1 $2
-        echo "+++ Clean ELWIX FS release ..."
-        rm -rf ${REL}/${OS} ${REL}/${OS_LITE}
  }
  build_fsdir()
  {
-        echo "+++ Build ELWIX FS directory ..."
+        echo "+++ Build ELWIX FS directory ... $1"
          mkdir -p $1
          cd $1
- Line 76  build_fsdir()
+ Line 74  build_fsdir()
          install -d boot;
  # cf
          install -d cf;
+         case ${TARGET} in
+                 i386)
+                         ln -fs /dev/ada0g cf/map.cfg
+                         ;;
+                 mips)
+                         ln -fs /dev/map/cfg cf/map.cfg
+                         ;;
+         esac
  # etc
          install -d etc;
          install -d -o 883 -g 883 etc/mqtt;
- Line 84  build_fsdir()
+ Line 90  build_fsdir()
  # home
          install -d home;
  # root
-        install -d -m 0700 root;
+        install -d -m 0750 root;
  # pkg
          install -d pkg;
          install -d pkg/db;
- Line 96  build_fsdir()
+ Line 102  build_fsdir()
          cd -
  }
- mkboot()
- {
-         echo "+++ Build ELWIX FS boot directory ..."
-         InstallDir ${WORLD}/boot $1/boot
-         install -m 644 ${CFGDIR}/boot/boot.config $1;
-         install -m 444 ${CFGDIR}/boot/beastie.4th $1/boot;
-         install -m 444 ${CFGDIR}/boot/brand.4th $1/boot;
-         install -m 444 ${CFGDIR}/boot/menu.4th $1/boot;
-         install -m 444 ${KERNDEVHINTS} $1/boot/device.hints;
-         if [ -r ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf ]; then
-                 install -m 644 ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf $1/boot/loader.conf;
-         else
-                 echo;
-                 echo "Can't find right loader.conf for TARGET_ARCH=${TARGET_ARCH} ... loader.conf not installed!";
-                 echo;
-         fi;
- }
- mkvar()
- {
-         echo "+++ Build ELWIX FS var directory ..."
-         ln -s /tmp $1/altroot/var/tmp
-         touch $1/altroot/var/log/elwix
-         touch $1/altroot/var/log/lastlog
-         touch $1/altroot/var/log/wifi.log
-         touch $1/altroot/var/log/wtmp
-         touch $1/altroot/var/run/utmp
-         touch $1/altroot/var/account/acct
-         touch $1/altroot/var/log/auth.log
-         touch $1/altroot/var/log/cron
-         touch $1/altroot/var/log/console.log
-         touch $1/altroot/var/log/debug.log
-         touch $1/altroot/var/log/lpd-errs
-         touch $1/altroot/var/log/maillog
-         touch $1/altroot/var/log/messages
-         touch $1/altroot/var/log/security
-         touch $1/altroot/var/log/xferlog
-         touch $1/altroot/var/log/ppp.log
-         chgrp network $1/altroot/var/log/ppp.log
-         InstallDir ${WORLD}/var/named $1/altroot/var/named
-         InstallList ${ELWIX_BSDSRC} ${BSDSRC} $1/altroot/var/named
-         install -v ${FS_ETC}/resolv.safe $1/altroot/var/run/resolv.conf
- }
- create_etc_motd()
- {
-         ELWIX_VER="ELWIX$2-${VERSION}_${TARGET_ARCH}";
-         ELWIX_HDR_MOTD="${ELWIX_VER} :: Build date ${BUILD_DATE}";
-         awk -v fo="${1:-motd}" 'BEGIN { print "'"${ELWIX_HDR_MOTD}"'" > fo; } { print $0 >> fo; }' \
-                    ${CFGDIR}/elwix_signature.txt;
- }
  create_etc_fstab()
  {
-        cat >$1 <<_EOF
+        cat >$1/etc/fstab <<_EOF
-# Automatic generated fstab for ELWIX$2 at ${BUILD_DATE}
+# Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
  #
  /dev/ufs/elwix          /elwix  ufs     ro                      0       1
- md3                     /tmp    mfs     rw,-s8m,-oasync,-S      0       0
- md4                     /var    mfs     rw,-s16m,-S             0       0
  _EOF
  }
-mketc()
+update_etc_cfexec()
  {
-        echo "+++ Build ELWIX FS etc directory ..."
+        echo "mount = \"/elwix\"" >> $1/etc/cfexec.conf
-        InstallDir ${FS_ETC} $1/etc
-        chown -R root:wheel $1/etc;
-        chmod 0600 $1/etc/opieaccess;
-        chmod 0600 $1/etc/opiekeys;
-        chmod 0600 $1/etc/master.passwd;
-        chmod 0600 $1/etc/spwd.db;
-        chmod 0600 $1/etc/ssh/ssh_host_dsa_key;
-        chmod 0600 $1/etc/ssh/ssh_host_key;
-        chmod 0600 $1/etc/ssh/ssh_host_rsa_key;
-        chmod 0600 $1/etc/ssh/ssh_host_ecdsa_key;
-        chmod 0440 $1/etc/sudoers;
-        chgrp 80 $1/etc/config.xml;
-        chmod 0660 $1/etc/config.xml;
-        chgrp -R 883 $1/etc/mqtt;
-        chown -R 883 $1/etc/mqtt;
-        ln -sf /etc/rc.s $1/etc/rc.S
-        ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime;
-        ln -sf /usr/share/misc/termcap $1/etc/termcap;
-        ln -sf /var/named/etc/namedb $1/etc/namedb;
-        ln -sf /var/run/resolv.conf $1/etc/resolv.conf;
-        ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf;
-        echo ${TARGET_ARCH} >$1/etc/platform;
-        create_etc_motd $1/etc/motd $2;
-        create_etc_fstab $1/etc/fstab $2;
-        echo "+++ ELWIX clean CVS tags ..."
-        CleanCVS $1
-        CleanCVS $1/etc
  }
- mkbackup()
- {
-         echo "+++ Build ELWIX FS backup factory default directory ..."
-         mkdir -p $1/altroot/backup
-         cd $1
-         cp -p etc/config.xml altroot/backup
-         tar -czf altroot/backup/.etc.tgz etc
-         cd altroot
-         tar -czf backup/.var.tgz var
- }
- mkhome()
- {
-         echo "+++ Build ELWIX FS root home directory ..."
-         install -d $1/root/.ssh
-         [ -r ${CFGDIR}/root.skel/ssh/authorized_keys2 ] && \
-                 install -v ${CFGDIR}/root.skel/ssh/authorized_keys2 $1/root/.ssh;
-         install -v ${CFGDIR}/root.skel/cshrc $1/root/.cshrc;
-         install -v ${CFGDIR}/root.skel/login $1/root/.login;
-         install -v ${CFGDIR}/root.skel/logout $1/root/.logout;
-         install -v ${CFGDIR}/root.skel/profile $1/root/.profile;
-         install -v ${CFGDIR}/root.skel/vimrc $1/root/.vimrc;
- }
  install_fsdir()
  {
-        echo "+++ Install ELWIX FS $1 in bundle OS install file ..."
+        echo "+++ Install ELWIX RootFS $1 in bundle OS install file ..."
          OSZ=""
-        install -v ${REL}/${ROOTFS_KERN} $1/boot/kernel
+        install -v ${REL}/${ROOTFS_KERN} $1/boot/kernel/kernel.gz
-        if [ -z "$2" ]; then
+        case "$2" in
-                install -v ${REL}/${ROMFS_IMG} $1/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH}
+                [Ee][Xx][Tt])
-                ln $1/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} $1/altroot/${ROMFS_IMG}
+                        install -d $1/usr
-                ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} $1/${ROMFS_IMG}
+                        cd $1/usr
+                        pax -r -z -pe -f ${REL}/${ROMFS_IMG}
+                        cd -
-                install -v ${REL}/${ROMFS_IMG2} $1/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH}
+                        install -d $1/usr/local
-                ln $1/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} $1/altroot/${ROMFS_IMG2}
+                        cd $1/usr/local
-                ln -s /elwix/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} $1/${ROMFS_IMG2}
+                        pax -r -z -pe -f ${REL}/${ROMFS_IMG2}
+                        cd -
-                OSZ=${REL}/${OS}
+                        OSZ=${REL}/${OS_EXT}
-        else
+                        ;;
-                install -d $1/usr
+                *)
-                cd $1/usr
+                        install -v ${REL}/${ROMFS_IMG} \
-                pax -r -z -pe -f ${REL}/${ROMFS_IMG}
+                                $1/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH}
-                cd -
+                        ln $1/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} \
+                                $1/altroot/${ROMFS_IMG}
+                        ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} \
+                                $1/${ROMFS_IMG}
-                OSZ=${REL}/${OS_LITE}
+                        install -v ${REL}/${ROMFS_IMG2} \
-        fi
+                                $1/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH}
+                        ln $1/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} \
+                                $1/altroot/${ROMFS_IMG2}
+                        ln -s /elwix/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} \
+                                $1/${ROMFS_IMG2}
+                         OSZ=${REL}/${OS}
+                         ;;
+         esac
          cd $1
          tar -czvf $OSZ .
+         echo "+++ Completed ELWIX RootFS $1 --> $OSZ"
  }
  ### main()
- Line 279  if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS
+ Line 172  if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS
          exit 1
  fi
-clean_fsdir
+clean_fsdir ${FS} ${REL}/${OS} || exit 1
+clean_fsdir ${FS_EXT} ${REL}/${OS_EXT} || exit 1
-build_fsdir ${FS}
+build_fsdir ${FS} || exit 1
-build_fsdir ${FS_LITE}
+build_fsdir ${FS_EXT} || exit 1
-mkboot ${FS}
+MakeFS_home ${FS} || exit 1
-mkboot ${FS_LITE}
+MakeFS_home ${FS_EXT} || exit 1
-mkhome ${FS}
+MakeFS_var ${FS} ${FS_ETC} || exit 1
-mkhome ${FS_LITE}
+MakeFS_var ${FS_EXT} ${FS_EXT_ETC} || exit 1
-mkvar ${FS}
+MakeFS_etc ${FS} ${FS_ETC} || exit 1
-mkvar ${FS_LITE}
+MakeFS_etc ${FS_EXT} ${FS_EXT_ETC} ext || exit 1
-mketc ${FS}
+create_etc_fstab ${FS} || exit 1
-mketc ${FS_LITE} "_lite"
+create_etc_fstab ${FS_EXT} ext || exit 1
-mkbackup ${FS}
+update_etc_cfexec ${FS} || exit 1
-mkbackup ${FS_LITE}
+update_etc_cfexec ${FS_EXT} ext || exit 1
-install_fsdir ${FS}
+MakeFS_backup ${FS} || exit 1
-install_fsdir ${FS_LITE} "_lite"
+MakeFS_backup ${FS_EXT} || exit 1
-echo "+++ Complete build ELWIX FS"
+MakeFS_boot ${FS} || exit 1
-echo "ELWIX finish version ${VERSION}, Good luck!"
+MakeFS_boot ${FS_EXT} || exit 1
+install_fsdir ${FS} || exit 1
+install_fsdir ${FS_EXT} ext || exit 1
+echo "+++ Complete build ELWIX RootFS system"
+echo "ELWIX RootFS finish version ${VERSION}, Good luck!"

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.3.2.16
changed lines
	Added in v.1.10.2.4