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 2098 by niro, Thu Mar 28 15:39:45 2013 UTC revision 2123 by niro, Thu May 16 13:24:53 2013 UTC
    # Line 198  prepare_iso() Line 198  prepare_iso()
    198   if [[ -z $(chroot ${CDCHROOTDIR} getent group lock) ]]   if [[ -z $(chroot ${CDCHROOTDIR} getent group lock) ]]
    199   then   then
    200   echo "adding missing group 'lock'"   echo "adding missing group 'lock'"
    201   chroot ${CDCHROOTDIR}  groupadd -g 54 lock   chroot ${CDCHROOTDIR} /usr/lib/mage/mgroupadd -o "-g 54" lock
    202   fi   fi
    203   # dbus plugdev group   # dbus plugdev group
    204   if [[ -z $(chroot ${CDCHROOTDIR} getent group plugdev) ]]   if [[ -z $(chroot ${CDCHROOTDIR} getent group plugdev) ]]
    205   then   then
    206   echo "adding missing group 'plugdev'"   echo "adding missing group 'plugdev'"
    207   chroot ${CDCHROOTDIR}  groupadd -g 302 plugdev   chroot ${CDCHROOTDIR} /usr/lib/mage/mgroupadd -o "-g 302" plugdev
    208   fi   fi
    209   # dbus messagebus group   # dbus messagebus group
    210   if [[ -z $(chroot ${CDCHROOTDIR} getent group messagebus) ]]   if [[ -z $(chroot ${CDCHROOTDIR} getent group messagebus) ]]
    211   then   then
    212   echo "adding missing group 'messagebus'"   echo "adding missing group 'messagebus'"
    213   chroot ${CDCHROOTDIR}  groupadd -g 300 messagebus   chroot ${CDCHROOTDIR} /usr/lib/mage/mgroupadd -o "-g 300" messagebus
    214   fi   fi
    215   # dbus messagebus user   # dbus messagebus user
    216   if [[ -z $(chroot ${CDCHROOTDIR} getent passwd messagebus) ]]   if [[ -z $(chroot ${CDCHROOTDIR} getent passwd messagebus) ]]
    217   then   then
    218   echo "adding missing user 'messagebus'"   echo "adding missing user 'messagebus'"
    219   chroot ${CDCHROOTDIR}  useradd -u 300 -g messagebus -d /dev/null -s /bin/false messagebus   chroot ${CDCHROOTDIR} /usr/lib/mage/museradd -o "-u 300 -g messagebus -d /dev/null -s /bin/false" messagebus
    220   fi   fi
    221   fi   fi
    222   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die
    # Line 353  generate_rootfs() Line 353  generate_rootfs()
    353    
    354   # copy everything to the image file and preserve permissions   # copy everything to the image file and preserve permissions
    355   ( cd ${CDCHROOTDIR} && tar cpf - . ) | ( cd ${LIVECDROOT}/loop/mnt && tar xvpf - )   ( cd ${CDCHROOTDIR} && tar cpf - . ) | ( cd ${LIVECDROOT}/loop/mnt && tar xvpf - )
    356     sleep 3
    357    
    358   # now umount everything and create the squashfs image   # now umount everything and create the squashfs image
    359   umount ${LIVECDROOT}/loop/mnt || die   umount ${LIVECDROOT}/loop/mnt || die
    # Line 395  install_bootloader() Line 396  install_bootloader()
    396   install ${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
    # Line 426  generate_initrd() Line 433  generate_initrd()
    433   echo Generating initrd image ...   echo Generating initrd image ...
    434   echo '#!/bin/bash' > ${CHROOTSH} || die   echo '#!/bin/bash' > ${CHROOTSH} || die
    435   echo 'export LC_ALL=C' >> ${CHROOTSH} || die   echo 'export LC_ALL=C' >> ${CHROOTSH} || die
    436   echo 'kv="$(readlink /boot/vmlinuz)"' >> ${CHROOTSH} || die   # support kernel installations without symlinks
    437   echo 'kv="${kv/kernel-}/"' >> ${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   # prefer dracut
    445   echo 'if [[ -x /sbin/dracut ]] || [[ -x /usr/sbin/dracut ]] || [[ -x /usr/bin/dracut ]]' >> ${CHROOTSH} || die   echo 'if [[ -x /sbin/dracut ]] || [[ -x /usr/sbin/dracut ]] || [[ -x /usr/bin/dracut ]]' >> ${CHROOTSH} || die
    446   echo 'then' >> ${CHROOTSH} || die   echo 'then' >> ${CHROOTSH} || die
    Legend:
    Removed from v.2098  
    changed lines
      Added in v.2123