Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mlivecdbuild/mlivecdbuild2.sh

    Diff of /trunk/mlivecdbuild/mlivecdbuild2.sh

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 978 by niro, Thu Apr 29 20:37:04 2010 UTC revision 2123 by niro, Thu May 16 13:24:53 2013 UTC
    # Line 19  CDID="mlcd-$(date +%F-%k%M)" Line 19  CDID="mlcd-$(date +%F-%k%M)"
    19  PROFILES_DIR="/usr/lib/mlivecdbuild/profiles"  PROFILES_DIR="/usr/lib/mlivecdbuild/profiles"
    20  GLOBAL_PROFILE="${PROFILES_DIR}/global"  GLOBAL_PROFILE="${PROFILES_DIR}/global"
    21    
    22    # get full path to isolinux.bin, may vary on multilib systems
    23    if [[ -f /usr/share/syslinux/isolinux.bin ]]
    24    then
    25     ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin
    26    elif [[ -f /usr/lib64/mkinitrd/isolinux.bin ]]
    27    then
    28     ISOLINUX_BIN=/usr/lib64/mkinitrd/isolinux.bin
    29    else
    30     ISOLINUX_BIN=/usr/lib/mkinitrd/isolinux.bin
    31    fi
    32    
    33  die() { echo "ERROR: $@"; exit 1; }  die() { echo "ERROR: $@"; exit 1; }
    34    
    35  # get_profile $filename  # get_profile $filename
    # Line 43  bootstrap_system() Line 54  bootstrap_system()
    54   --profile "${MAGE_PROFILE}" \   --profile "${MAGE_PROFILE}" \
    55   --toolchain "${TOOLCHAIN}" \   --toolchain "${TOOLCHAIN}" \
    56   --basesystem "${BASESYSTEM}" \   --basesystem "${BASESYSTEM}" \
    57     --update-tarball \
    58   || die "bootstrapping toolchain"   || die "bootstrapping toolchain"
    59  }  }
    60    
    # Line 50  custom_services() Line 62  custom_services()
    62  {  {
    63   local cmd="$1"   local cmd="$1"
    64   local services="$2"   local services="$2"
    65     local systemdcmd
    66    
    67   case ${cmd} in   case ${cmd} in
    68   add|del|default)   add|del|default)
    # Line 59  custom_services() Line 72  custom_services()
    72   local i   local i
    73   for i in ${services}   for i in ${services}
    74   do   do
    75   MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"   # systemd
    76     if [[ -x ${CDCHROOTDIR}/bin/systemctl ]] || [[ -x ${CDCHROOTDIR}/usr/bin/systemctl ]]
    77     then
    78     case ${cmd} in
    79     add) chroot ${CDCHROOTDIR} systemctl enable ${i} ;;
    80     del) chroot ${CDCHROOTDIR} systemctl disable ${i} ;;
    81     default)
    82     # convert targets
    83     case ${i} in
    84     2|3|multi-user) service="multi-user.target" ;;
    85     5|graphical) service="graphical.target" ;;
    86     esac
    87     chroot ${CDCHROOTDIR} systemctl enable ${i} ;;
    88     esac
    89     fi
    90     # busybox and sysvinit
    91     if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]] && [[ ! -x ${CDCHROOTDIR}/bin/systemctl ]]  && [[ ! -x ${CDCHROOTDIR}/usr/bin/systemctl ]]
    92     then
    93     MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"
    94     fi
    95   done   done
    96   fi   fi
    97   ;;   ;;
    # Line 137  prepare_iso() Line 169  prepare_iso()
    169   echo Preparing LiveCD ISO Image ...   echo Preparing LiveCD ISO Image ...
    170    
    171   # fixes some issues with xfree/xorg xkb   # fixes some issues with xfree/xorg xkb
    172   if [[ -L ${CDCHROOTDIR}/etc/X11/xkb ]] && [[ -d /usr/X11R6/lib/X11/xkb ]]   if [[ -L ${CDCHROOTDIR}/etc/X11/xkb ]] &&
    173     [[ -d ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ]]
    174   then   then
    175   rm ${CDCHROOTDIR}/etc/X11/xkb || die   rm ${CDCHROOTDIR}/etc/X11/xkb || die
    176   mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die   mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die
    177   ln -s ../../../../etc/X11/xkb ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb || die   ln -s ../../../../etc/X11/xkb ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb || die
    178   fi   fi
    179    
    180   install -m 0644 $(get_profile inittab) ${CDCHROOTDIR}/etc/inittab || die   # fix issues with >=dracut-014 which drops some default modules like livecd
    181     if [[ -x ${CDCHROOTDIR}/sbin/dracut ]] ||
    182     [[ -x ${CDCHROOTDIR}/usr/sbin/dracut ]] ||
    183     [[ -x ${CDCHROOTDIR}/usr/bin/dracut ]]
    184     then
    185     install -d ${CDCHROOTDIR}/etc/dracut.conf.d || die
    186     echo 'add_dracutmodules+=" dmsquash-live "' \
    187     > ${CDCHROOTDIR}/etc/dracut.conf.d/02-livecd.conf || die
    188     fi
    189    
    190     # only on sysvinit or busybox systems
    191     if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
    192     then
    193     install -m 0644 $(get_profile inittab) ${CDCHROOTDIR}/etc/inittab || die
    194     fi
    195     if [[ -x ${CDCHROOTDIR}/bin/systemctl ]] || [[ -x ${CDCHROOTDIR}/usr/bin/systemctl ]]
    196     then
    197     # check lock group on systemd systems
    198     if [[ -z $(chroot ${CDCHROOTDIR} getent group lock) ]]
    199     then
    200     echo "adding missing group 'lock'"
    201     chroot ${CDCHROOTDIR} /usr/lib/mage/mgroupadd -o "-g 54" lock
    202     fi
    203     # dbus plugdev group
    204     if [[ -z $(chroot ${CDCHROOTDIR} getent group plugdev) ]]
    205     then
    206     echo "adding missing group 'plugdev'"
    207     chroot ${CDCHROOTDIR} /usr/lib/mage/mgroupadd -o "-g 302" plugdev
    208     fi
    209     # dbus messagebus group
    210     if [[ -z $(chroot ${CDCHROOTDIR} getent group messagebus) ]]
    211     then
    212     echo "adding missing group 'messagebus'"
    213     chroot ${CDCHROOTDIR} /usr/lib/mage/mgroupadd -o "-g 300" messagebus
    214     fi
    215     # dbus messagebus user
    216     if [[ -z $(chroot ${CDCHROOTDIR} getent passwd messagebus) ]]
    217     then
    218     echo "adding missing user 'messagebus'"
    219     chroot ${CDCHROOTDIR} /usr/lib/mage/museradd -o "-u 300 -g messagebus -d /dev/null -s /bin/false" messagebus
    220     fi
    221     fi
    222   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die
    223   install -m 0644 $(get_profile motd) ${CDCHROOTDIR}/etc/motd || die   install -m 0644 $(get_profile motd) ${CDCHROOTDIR}/etc/motd || die
    224   install -m 0644 $(get_profile issue) ${CDCHROOTDIR}/etc/issue || die   install -m 0644 $(get_profile issue) ${CDCHROOTDIR}/etc/issue || die
    225   install -m 0644 $(get_profile net.eth0) ${CDCHROOTDIR}/etc/conf.d/net.eth0 || die   install -m 0644 $(get_profile net.eth0) ${CDCHROOTDIR}/etc/conf.d/net.eth0 || die
    226   echo "${CDHOSTNAME}" > ${CDCHROOTDIR}/etc/hostname || die   echo "${CDHOSTNAME}" > ${CDCHROOTDIR}/etc/hostname || die
    227     install -d ${CDCHROOTDIR}/mnt/magellan || die
    228    
    229   echo Setting up services ...   echo Setting up services ...
    230    
    231     # install systemd default services
    232     if [[ -x ${CDCHROOTDIR}/bin/systemctl ]]
    233     then
    234     # install tmpfs /tmp and /var/tmp
    235     install -m 0644 $(get_profile tmp.mount) ${CDCHROOTDIR}/lib/systemd/system/ || die
    236     install -m 0644 $(get_profile var-tmp.mount) ${CDCHROOTDIR}/lib/systemd/system/ || die
    237     # enable them
    238     ln -snf ../tmp.mount ${CDCHROOTDIR}/lib/systemd/system/local-fs.target.wants/tmp.mount || die
    239     ln -snf ../var-tmp.mount ${CDCHROOTDIR}/lib/systemd/system/local-fs.target.wants/var-tmp.mount || die
    240     fi
    241     # newer systemd goes to /usr/lib
    242     if [[ -x ${CDCHROOTDIR}/usr/bin/systemctl ]]
    243     then
    244     # install tmpfs /tmp and /var/tmp
    245     install -m 0644 $(get_profile tmp.mount) ${CDCHROOTDIR}/usr/lib/systemd/system/ || die
    246     install -m 0644 $(get_profile var-tmp.mount) ${CDCHROOTDIR}/usr/lib/systemd/system/ || die
    247     # enable them
    248     ln -snf ../tmp.mount ${CDCHROOTDIR}/usr/lib/systemd/system/local-fs.target.wants/tmp.mount || die
    249     ln -snf ../var-tmp.mount ${CDCHROOTDIR}/usr/lib/systemd/system/local-fs.target.wants/var-tmp.mount || die
    250     fi
    251    
    252     if [[ -x ${CDCHROOTDIR}/bin/systemctl ]] || [[ -x ${CDCHROOTDIR}/usr/bin/systemctl ]]
    253     then
    254     install -m 0644 $(get_profile getty) ${CDCHROOTDIR}/etc/conf.d/getty || die
    255    
    256     custom_services add getty@.service
    257     custom_services add remote-fs.target
    258     # disable readahead
    259     custom_services del systemd-readahead-replay.service
    260     custom_services del systemd-readahead-collect.service
    261     fi
    262    
    263  # # add hardware detection  # # add hardware detection
    264  # MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"  # if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
    265    # then
    266    # MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"
    267    # fi
    268    
    269   # del checkfs   # del checkfs
    270   MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"   if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
    271     then
    272     MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"
    273     fi
    274    
    275   # add custom packages   # add custom packages
    276   [[ -n ${ADD_PACKAGES} ]] && custom_packages install "${ADD_PACKAGES}"   [[ -n ${ADD_PACKAGES} ]] && custom_packages install "${ADD_PACKAGES}"
    # Line 185  prepare_iso() Line 298  prepare_iso()
    298   fi   fi
    299    
    300   echo Cleaning unwanted files ...   echo Cleaning unwanted files ...
    301   :> ${CDCHROOTDIR}/etc/mtab || die "whiping /etc/mtab"   # do this only if not a symlink!
    302     if [[ ! -L ${CDCHROOTDIR}/etc/mtab ]]
    303     then
    304     :> ${CDCHROOTDIR}/etc/mtab || die "whiping /etc/mtab"
    305     fi
    306   [ -f ${CDCHROOTDIR}/root/.bash_history ] && rm ${CDCHROOTDIR}/root/.bash_history   [ -f ${CDCHROOTDIR}/root/.bash_history ] && rm ${CDCHROOTDIR}/root/.bash_history
    307  }  }
    308    
    309  generate_rootfs()  generate_rootfs()
    310  {  {
    311     local loopdev
    312     local size
    313    
    314     if [ -f ${LIVECDROOT}/loop/LiveOS/ext3fs.img ]
    315     then
    316     rm ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
    317     fi
    318     if [ -f ${CDISOROOT}/LiveOS/squashfs.img ]
    319     then
    320     rm ${CDISOROOT}/LiveOS/squashfs.img
    321     fi
    322     if [ -f ${CDISOROOT}/livecdrootfs.sqsh ]
    323     then
    324     rm ${CDISOROOT}/livecdrootfs.sqsh
    325     fi
    326    
    327   echo Generating squashfs compressed rootfs loopfile ...   echo Generating squashfs compressed rootfs loopfile ...
    328   mksquashfs ${CDCHROOTDIR} ${LIVECDROOT}/livecdrootfs.sqsh #>/dev/null 2>&1   if [[ -x ${CDCHROOTDIR}/sbin/dracut ]] ||
    329     [[ -x ${CDCHROOTDIR}/usr/sbin/dracut ]] ||
    330     [[ -x ${CDCHROOTDIR}/usr/bin/dracut ]]
    331     then
    332     install -d ${LIVECDROOT}/loop/{LiveOS,mnt} || die
    333    
    334     # get the actual size of the chroot
    335     size=$(du -s ${LIVECDROOT}/chroot | sed 's:^\(.*\)[[:space:]].*:\1:')
    336    
    337     # generate a ext3fs file for devicemapper
    338     dd if=/dev/zero of=${LIVECDROOT}/loop/LiveOS/ext3fs.img bs=1024 count=$(( ${size} + 10 )) || die
    339     # create a filesystem
    340     mkfs.ext3 -L "_${CDID}_EXT3" -m 1 -b 1024 -F ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
    341     # set mount_counts and check_intervals to 0
    342     # set dir_index top, to speed up thing with hashed b-trees
    343     # allow acls too
    344     tune2fs -c0 -i0 -Odir_index -ouser_xattr,acl ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
    345    
    346     # losetup the device
    347     loopdev=$(losetup -f)
    348     [[ -z ${loopdev} ]] && die "No unused loopdev found. Maybe you want 'modprobe loop'?"
    349    
    350     # mount the image
    351     losetup ${loopdev} ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
    352     mount ${loopdev} ${LIVECDROOT}/loop/mnt || die
    353    
    354     # copy everything to the image file and preserve permissions
    355     ( cd ${CDCHROOTDIR} && tar cpf - . ) | ( cd ${LIVECDROOT}/loop/mnt && tar xvpf - )
    356     sleep 3
    357    
    358     # now umount everything and create the squashfs image
    359     umount ${LIVECDROOT}/loop/mnt || die
    360     losetup -d ${loopdev} || die
    361     # remove mount to not ending up in the squashfs image
    362     if [[ -d ${LIVECDROOT}/loop/mnt ]]
    363     then
    364     rm -r ${LIVECDROOT}/loop/mnt || die
    365     fi
    366     mksquashfs ${LIVECDROOT}/loop ${LIVECDROOT}/livecdrootfs.sqsh || die
    367    
    368     # final cleanup
    369     if [[ -d ${LIVECDROOT}/loop ]]
    370     then
    371     rm -r ${LIVECDROOT}/loop || die
    372     fi
    373     else
    374     mksquashfs ${CDCHROOTDIR} ${LIVECDROOT}/livecdrootfs.sqsh || die
    375     fi
    376    
    377   echo Moving rootfs loopfile to isoroot ...   echo Moving rootfs loopfile to isoroot ...
    378   install -d ${CDISOROOT}   install -d ${CDISOROOT}
    379   mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}   if [[ -x ${CDCHROOTDIR}/sbin/dracut ]] ||
    380     [[ -x ${CDCHROOTDIR}/usr/sbin/dracut ]] ||
    381     [[ -x ${CDCHROOTDIR}/usr/bin/dracut ]]
    382     then
    383     install -d ${CDISOROOT}/LiveOS
    384     mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}/LiveOS/squashfs.img
    385     else
    386     mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}
    387     fi
    388  }  }
    389    
    390  install_bootloader()  install_bootloader()
    # Line 205  install_bootloader() Line 393  install_bootloader()
    393    
    394   # iso linux binary   # iso linux binary
    395   install -d ${CDISOROOT}/isolinux   install -d ${CDISOROOT}/isolinux
    396   install /usr/lib/mkinitrd/isolinux.bin ${CDISOROOT}/isolinux || die   install ${ISOLINUX_BIN} ${CDISOROOT}/isolinux || die
    397    
    398   # kernel   # kernel
    399   local kimg="$(basename $(readlink ${CDCHROOTDIR}/boot/vmlinuz))"   # support kernel installations without symlinks
    400     if [ -L ${CDCHROOTDIR}/boot/vmlinuz ]
    401     then
    402     local kimg="$(basename $(readlink ${CDCHROOTDIR}/boot/vmlinuz))"
    403     else
    404     local kimg="$(find ${CDCHROOTDIR}/boot -name kernel-\* -printf '%f\n')"
    405     fi
    406   install ${CDCHROOTDIR}/boot/${kimg} ${CDISOROOT}/isolinux/${CDKERNELNAME} || die   install ${CDCHROOTDIR}/boot/${kimg} ${CDISOROOT}/isolinux/${CDKERNELNAME} || die
    407    
    408   install -m 0644 $(get_profile isolinux.cfg) ${CDISOROOT}/isolinux || die   install -m 0644 $(get_profile isolinux.cfg) ${CDISOROOT}/isolinux || die
    409   install -m 0644 $(get_profile boot.lss) ${CDISOROOT}/isolinux || die   install -m 0644 $(get_profile boot.lss) ${CDISOROOT}/isolinux || die
    410   install -m 0644 $(get_profile boot.msg) ${CDISOROOT}/isolinux || die   install -m 0644 $(get_profile boot.msg) ${CDISOROOT}/isolinux || die
    411   install -m 0644 $(get_profile help.msg) ${CDISOROOT}/isolinux || die   install -m 0644 $(get_profile help.msg) ${CDISOROOT}/isolinux || die
    412     # support the new layout too
    413     if [[ -f $(get_profile index.msg) ]]
    414     then
    415     install -m 0644 $(get_profile index.msg) ${CDISOROOT}/isolinux || die
    416     fi
    417     if [[ -f $(get_profile debug.msg) ]]
    418     then
    419     install -m 0644 $(get_profile debug.msg) ${CDISOROOT}/isolinux || die
    420     fi
    421    
    422   return 0   return 0
    423  }  }
    # Line 223  generate_initrd() Line 426  generate_initrd()
    426  {  {
    427   local CHROOTSH="$(mktemp -p ${CDCHROOTDIR})"   local CHROOTSH="$(mktemp -p ${CDCHROOTDIR})"
    428    
    429     is_loc_mounted "${CDCHROOTDIR}/sys" || mount -t sysfs sysfs ${CDCHROOTDIR}/sys
    430     is_loc_mounted "${CDCHROOTDIR}/proc" || mount -t proc proc ${CDCHROOTDIR}/proc
    431     is_loc_mounted "${CDCHROOTDIR}/dev" || mount -o bind /dev ${CDCHROOTDIR}/dev
    432    
    433   echo Generating initrd image ...   echo Generating initrd image ...
    434   echo '#!/bin/bash' > ${CHROOTSH} || die   echo '#!/bin/bash' > ${CHROOTSH} || die
    435   echo 'kv="$(readlink /boot/vmlinuz)"' >> ${CHROOTSH} || die   echo 'export LC_ALL=C' >> ${CHROOTSH} || die
    436   echo 'kv="${kv/kernel-}/"' >> ${CHROOTSH} || die   # support kernel installations without symlinks
    437   echo 'mkinitrd-livecd -f --initramfs /initrd.gz ${kv}' >> ${CHROOTSH} || die   if [ -L ${CDCHROOTDIR}/boot/vmlinuz ]
    438     then
    439     echo 'kv="$(readlink /boot/vmlinuz)"' >> ${CHROOTSH} || die
    440     else
    441     echo "kv=\$(find /boot -name kernel-\* -printf '%f\n')" >> ${CHROOTSH} || die
    442     fi
    443     echo 'kv="${kv/kernel-/}"' >> ${CHROOTSH} || die
    444     # prefer dracut
    445     echo 'if [[ -x /sbin/dracut ]] || [[ -x /usr/sbin/dracut ]] || [[ -x /usr/bin/dracut ]]' >> ${CHROOTSH} || die
    446     echo 'then' >> ${CHROOTSH} || die
    447     echo ' dracut -v -f /initrd.gz ${kv}' >> ${CHROOTSH} || die
    448     echo 'else' >> ${CHROOTSH} || die
    449     echo ' mkinitrd-livecd -f --initramfs /initrd.gz ${kv}' >> ${CHROOTSH} || die
    450     echo 'fi' >> ${CHROOTSH} || die
    451   chmod +x ${CHROOTSH} || die   chmod +x ${CHROOTSH} || die
    452   chroot ${CDCHROOTDIR} /$(basename ${CHROOTSH}) || die   chroot ${CDCHROOTDIR} /$(basename ${CHROOTSH}) || die
    453   [[ -f ${CHROOTSH} ]] && rm ${CHROOTSH} || die   [[ -f ${CHROOTSH} ]] && rm ${CHROOTSH} || die
    454    
    455     is_loc_mounted "${CDCHROOTDIR}/dev" && umount ${CDCHROOTDIR}/dev
    456     is_loc_mounted "${CDCHROOTDIR}/proc" && umount ${CDCHROOTDIR}/proc
    457     is_loc_mounted "${CDCHROOTDIR}/sys" && umount ${CDCHROOTDIR}/sys
    458    
    459   # move initrd to isoroot   # move initrd to isoroot
    460   install -d ${CDISOROOT}/isolinux || die   install -d ${CDISOROOT}/isolinux || die
    461   mv ${CDCHROOTDIR}/initrd.gz ${CDISOROOT}/isolinux || die   mv ${CDCHROOTDIR}/initrd.gz ${CDISOROOT}/isolinux || die
    # Line 259  generate_iso() Line 483  generate_iso()
    483    
    484  enter_livecd()  enter_livecd()
    485  {  {
    486   mount -t sysfs sysfs ${CDCHROOTDIR}/sys   is_loc_mounted "${CDCHROOTDIR}/sys" || mount -t sysfs sysfs ${CDCHROOTDIR}/sys
    487   mount -t proc proc ${CDCHROOTDIR}/proc   is_loc_mounted "${CDCHROOTDIR}/proc" || mount -t proc proc ${CDCHROOTDIR}/proc
    488   mount -o bind /dev ${CDCHROOTDIR}/dev   is_loc_mounted "${CDCHROOTDIR}/dev" || mount -o bind /dev ${CDCHROOTDIR}/dev
    489    
    490   chroot ${CDCHROOTDIR} \   chroot ${CDCHROOTDIR} \
    491   /usr/bin/env -i \   /usr/bin/env -i \
    # Line 273  enter_livecd() Line 497  enter_livecd()
    497   no_proxy=${no_proxy} \   no_proxy=${no_proxy} \
    498   /bin/bash -i   /bin/bash -i
    499    
    500   umount ${CDCHROOTDIR}/dev   is_loc_mounted "${CDCHROOTDIR}/dev" && umount ${CDCHROOTDIR}/dev
    501   umount ${CDCHROOTDIR}/proc   is_loc_mounted "${CDCHROOTDIR}/proc" && umount ${CDCHROOTDIR}/proc
    502   umount ${CDCHROOTDIR}/sys   is_loc_mounted "${CDCHROOTDIR}/sys" && umount ${CDCHROOTDIR}/sys
    503    }
    504    
    505    is_loc_mounted()
    506    {
    507     local filesys
    508     local i
    509     filesys=$1
    510    
    511     i="$(cat /proc/mounts | grep " ${filesys} " | cut -d ' ' -f2)"
    512     [[ ${i} != ${filesys} ]] && return 1
    513    
    514     return 0
    515    }
    516    
    517    trap_exit()
    518    {
    519     is_loc_mounted "${CDCHROOTDIR}/dev" && umount ${CDCHROOTDIR}/dev
    520     is_loc_mounted "${CDCHROOTDIR}/proc" && umount ${CDCHROOTDIR}/proc
    521     is_loc_mounted "${CDCHROOTDIR}/sys" && umount ${CDCHROOTDIR}/sys
    522  }  }
    523    
    524  usage()  usage()
    # Line 297  usage() Line 540  usage()
    540   echo   echo
    541  }  }
    542    
    543    # set some proper traps
    544    trap "trap_exit" SIGINT SIGQUIT
    545    
    546  # source profile config - overrides all other vars  # source profile config - overrides all other vars
    547  [ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config  [ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config
    548    
    Legend:
    Removed from v.978  
    changed lines
      Added in v.2123