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