Magellan Linux

Diff of /trunk/mlivecdbuild/mlivecdbuild2.sh

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

revision 1402 by niro, Sun Jun 5 02:31:52 2011 UTC revision 1531 by niro, Fri Nov 4 11:34:30 2011 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 an multilib systems  # get full path to isolinux.bin, may vary on multilib systems
23  if [[ -f /usr/lib64/mkinitrd/isolinux.bin ]]  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  then
28   ISOLINUX_BIN=/usr/lib64/mkinitrd/isolinux.bin   ISOLINUX_BIN=/usr/lib64/mkinitrd/isolinux.bin
29  else  else
# Line 58  custom_services() Line 61  custom_services()
61  {  {
62   local cmd="$1"   local cmd="$1"
63   local services="$2"   local services="$2"
64     local systemdcmd
65    
66   case ${cmd} in   case ${cmd} in
67   add|del|default)   add|del|default)
# Line 67  custom_services() Line 71  custom_services()
71   local i   local i
72   for i in ${services}   for i in ${services}
73   do   do
74   MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"   # systemd
75     if [[ -x ${CDCHROOTDIR}/sbin/systemctl ]]
76     then
77     case ${cmd} in
78     add) chroot ${CDCHROOTDIR} systemctl enable ${i} ;;
79     del) chroot ${CDCHROOTDIR} systemctl disable ${i} ;;
80     default)
81     # convert targets
82     case ${i} in
83     2|3) service="multi-user.target" ;;
84     5) service="graphical.target" ;;
85     esac
86     chroot ${CDCHROOTDIR} systemctl enable ${i} ;;
87     esac
88     fi
89     # busybox and sysvinit
90     if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
91     then
92     MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"
93     fi
94   done   done
95   fi   fi
96   ;;   ;;
# Line 152  prepare_iso() Line 175  prepare_iso()
175   ln -s ../../../../etc/X11/xkb ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb || die   ln -s ../../../../etc/X11/xkb ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb || die
176   fi   fi
177    
178   install -m 0644 $(get_profile inittab) ${CDCHROOTDIR}/etc/inittab || die   # only on sysvinit or busybox systems
179     if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
180     then
181     install -m 0644 $(get_profile inittab) ${CDCHROOTDIR}/etc/inittab || die
182     fi
183     if [[ -x ${CDCHROOTDIR}/bin/systemctl ]]
184     then
185     # check lock group on systemd systems
186     if [[ -z $(chroot ${CDCHROOTDIR} getent group lock) ]]
187     then
188     echo "adding missing group 'lock'"
189     chroot ${CDCHROOTDIR}  groupadd -g 54 lock
190     fi
191     # dbus plugdev group
192     if [[ -z $(chroot ${CDCHROOTDIR} getent group plugdev) ]]
193     then
194     echo "adding missing group 'plugdev'"
195     chroot ${CDCHROOTDIR}  groupadd -g 302 plugdev
196     fi
197     # dbus messagebus group
198     if [[ -z $(chroot ${CDCHROOTDIR} getent group messagebus) ]]
199     then
200     echo "adding missing group 'messagebus'"
201     chroot ${CDCHROOTDIR}  groupadd -g 300 messagebus
202     fi
203     # dbus messagebus user
204     if [[ -z $(chroot ${CDCHROOTDIR} getent passwd messagebus) ]]
205     then
206     echo "adding missing user 'messagebus'"
207     chroot ${CDCHROOTDIR}  useradd -u 300 -g messagebus -d /dev/null -s /bin/false messagebus
208     fi
209     fi
210   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die
211   install -m 0644 $(get_profile motd) ${CDCHROOTDIR}/etc/motd || die   install -m 0644 $(get_profile motd) ${CDCHROOTDIR}/etc/motd || die
212   install -m 0644 $(get_profile issue) ${CDCHROOTDIR}/etc/issue || die   install -m 0644 $(get_profile issue) ${CDCHROOTDIR}/etc/issue || die
# Line 161  prepare_iso() Line 215  prepare_iso()
215    
216   echo Setting up services ...   echo Setting up services ...
217    
218     # install systemd default services
219     if [[ -x ${CDCHROOTDIR}/bin/systemctl ]]
220     then
221     # install tmpfs /tmp and /var/tmp
222     install -m 0644 $(get_profile tmp.mount) ${CDCHROOTDIR}/lib/systemd/system/ || die
223     install -m 0644 $(get_profile var-tmp.mount) ${CDCHROOTDIR}/lib/systemd/system/ || die
224     # enable them
225     ln -snf ../tmp.mount ${CDCHROOTDIR}/lib/systemd/system/local-fs.target.wants/tmp.mount || die
226     ln -snf ../var-tmp.mount ${CDCHROOTDIR}/lib/systemd/system/local-fs.target.wants/var-tmp.mount || die
227    
228     install -m 0644 $(get_profile getty) ${CDCHROOTDIR}/etc/conf.d/getty || die
229    
230     custom_services add getty@.service
231     custom_services add remote-fs.target
232     # disable readahead
233     custom_services del systemd-readahead-replay.service
234     custom_services del systemd-readahead-collect.service
235     fi
236    
237  # # add hardware detection  # # add hardware detection
238  # MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"  # if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
239    # then
240    # MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"
241    # fi
242    
243   # del checkfs   # del checkfs
244   MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"   if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
245     then
246     MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"
247     fi
248    
249   # add custom packages   # add custom packages
250   [[ -n ${ADD_PACKAGES} ]] && custom_packages install "${ADD_PACKAGES}"   [[ -n ${ADD_PACKAGES} ]] && custom_packages install "${ADD_PACKAGES}"
# Line 193  prepare_iso() Line 272  prepare_iso()
272   fi   fi
273    
274   echo Cleaning unwanted files ...   echo Cleaning unwanted files ...
275   :> ${CDCHROOTDIR}/etc/mtab || die "whiping /etc/mtab"   # do this only if not a symlink!
276     if [[ ! -L ${CDCHROOTDIR}/etc/mtab ]]
277     then
278     :> ${CDCHROOTDIR}/etc/mtab || die "whiping /etc/mtab"
279     fi
280   [ -f ${CDCHROOTDIR}/root/.bash_history ] && rm ${CDCHROOTDIR}/root/.bash_history   [ -f ${CDCHROOTDIR}/root/.bash_history ] && rm ${CDCHROOTDIR}/root/.bash_history
281  }  }
282    
283  generate_rootfs()  generate_rootfs()
284  {  {
285     local loopdev
286     local size
287    
288     if [ -f ${LIVECDROOT}/loop/LiveOS/ext3fs.img ]
289     then
290     rm ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
291     fi
292     if [ -f ${CDISOROOT}/LiveOS/squashfs.img ]
293     then
294     rm ${CDISOROOT}/LiveOS/squashfs.img
295     fi
296     if [ -f ${CDISOROOT}/livecdrootfs.sqsh ]
297     then
298     rm ${CDISOROOT}/livecdrootfs.sqsh
299     fi
300    
301   echo Generating squashfs compressed rootfs loopfile ...   echo Generating squashfs compressed rootfs loopfile ...
302   mksquashfs ${CDCHROOTDIR} ${LIVECDROOT}/livecdrootfs.sqsh #>/dev/null 2>&1   if [[ -x ${CDCHROOTDIR}/sbin/dracut ]]
303     then
304     install -d ${LIVECDROOT}/loop/{LiveOS,mnt} || die
305    
306     # get the actual size of the chroot
307     size=$(du -s ${LIVECDROOT}/chroot | sed 's:^\(.*\)[[:space:]].*:\1:')
308    
309     # generate a ext3fs file for devicemapper
310     dd if=/dev/zero of=${LIVECDROOT}/loop/LiveOS/ext3fs.img bs=1024 count=$(( ${size} + 10 )) || die
311     # create a filesystem
312     mkfs.ext3 -L "_${CDID}_EXT3" -m 1 -b 1024 -F ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
313     # set mount_counts and check_intervals to 0
314     # set dir_index top, to speed up thing with hashed b-trees
315     # allow acls too
316     tune2fs -c0 -i0 -Odir_index -ouser_xattr,acl ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
317    
318     # losetup the device
319     loopdev=$(losetup -f)
320     [[ -z ${loopdev} ]] && die "No unused loopdev found. Maybe you want 'modprobe loop'?"
321    
322     # mount the image
323     losetup ${loopdev} ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
324     mount ${loopdev} ${LIVECDROOT}/loop/mnt || die
325    
326     # copy everything to the image file and preserve permissions
327     ( cd ${CDCHROOTDIR} && tar cpf - . ) | ( cd ${LIVECDROOT}/loop/mnt && tar xvpf - )
328    
329     # now umount everything and create the squashfs image
330     umount ${LIVECDROOT}/loop/mnt || die
331     losetup -d ${loopdev} || die
332     # remove mount to not ending up in the squashfs image
333     if [[ -d ${LIVECDROOT}/loop/mnt ]]
334     then
335     rm -r ${LIVECDROOT}/loop/mnt || die
336     fi
337     mksquashfs ${LIVECDROOT}/loop ${LIVECDROOT}/livecdrootfs.sqsh || die
338    
339     # final cleanup
340     if [[ -d ${LIVECDROOT}/loop ]]
341     then
342     rm -r ${LIVECDROOT}/loop || die
343     fi
344     else
345     mksquashfs ${CDCHROOTDIR} ${LIVECDROOT}/livecdrootfs.sqsh || die
346     fi
347    
348   echo Moving rootfs loopfile to isoroot ...   echo Moving rootfs loopfile to isoroot ...
349   install -d ${CDISOROOT}   install -d ${CDISOROOT}
350   mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}   if [[ -x ${CDCHROOTDIR}/sbin/dracut ]]
351     then
352     install -d ${CDISOROOT}/LiveOS
353     mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}/LiveOS/squashfs.img
354     else
355     mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}
356     fi
357  }  }
358    
359  install_bootloader()  install_bootloader()
# Line 223  install_bootloader() Line 372  install_bootloader()
372   install -m 0644 $(get_profile boot.lss) ${CDISOROOT}/isolinux || die   install -m 0644 $(get_profile boot.lss) ${CDISOROOT}/isolinux || die
373   install -m 0644 $(get_profile boot.msg) ${CDISOROOT}/isolinux || die   install -m 0644 $(get_profile boot.msg) ${CDISOROOT}/isolinux || die
374   install -m 0644 $(get_profile help.msg) ${CDISOROOT}/isolinux || die   install -m 0644 $(get_profile help.msg) ${CDISOROOT}/isolinux || die
375     # support the new layout too
376     if [[ -f $(get_profile index.msg) ]]
377     then
378     install -m 0644 $(get_profile index.msg) ${CDISOROOT}/isolinux || die
379     fi
380     if [[ -f $(get_profile debug.msg) ]]
381     then
382     install -m 0644 $(get_profile debug.msg) ${CDISOROOT}/isolinux || die
383     fi
384    
385   return 0   return 0
386  }  }
# Line 231  generate_initrd() Line 389  generate_initrd()
389  {  {
390   local CHROOTSH="$(mktemp -p ${CDCHROOTDIR})"   local CHROOTSH="$(mktemp -p ${CDCHROOTDIR})"
391    
392     is_loc_mounted "${CDCHROOTDIR}/sys" || mount -t sysfs sysfs ${CDCHROOTDIR}/sys
393     is_loc_mounted "${CDCHROOTDIR}/proc" || mount -t proc proc ${CDCHROOTDIR}/proc
394     is_loc_mounted "${CDCHROOTDIR}/dev" || mount -o bind /dev ${CDCHROOTDIR}/dev
395    
396   echo Generating initrd image ...   echo Generating initrd image ...
397   echo '#!/bin/bash' > ${CHROOTSH} || die   echo '#!/bin/bash' > ${CHROOTSH} || die
398     echo 'export LC_ALL=C' >> ${CHROOTSH} || die
399   echo 'kv="$(readlink /boot/vmlinuz)"' >> ${CHROOTSH} || die   echo 'kv="$(readlink /boot/vmlinuz)"' >> ${CHROOTSH} || die
400   echo 'kv="${kv/kernel-}/"' >> ${CHROOTSH} || die   echo 'kv="${kv/kernel-}/"' >> ${CHROOTSH} || die
401   echo 'mkinitrd-livecd -f --initramfs /initrd.gz ${kv}' >> ${CHROOTSH} || die   # prefer dracut
402     echo 'if [[ -x /sbin/dracut ]]' >> ${CHROOTSH} || die
403     echo 'then' >> ${CHROOTSH} || die
404     echo ' dracut -v -f /initrd.gz ${kv}' >> ${CHROOTSH} || die
405     echo 'else' >> ${CHROOTSH} || die
406     echo ' mkinitrd-livecd -f --initramfs /initrd.gz ${kv}' >> ${CHROOTSH} || die
407     echo 'fi' >> ${CHROOTSH} || die
408   chmod +x ${CHROOTSH} || die   chmod +x ${CHROOTSH} || die
409   chroot ${CDCHROOTDIR} /$(basename ${CHROOTSH}) || die   chroot ${CDCHROOTDIR} /$(basename ${CHROOTSH}) || die
410   [[ -f ${CHROOTSH} ]] && rm ${CHROOTSH} || die   [[ -f ${CHROOTSH} ]] && rm ${CHROOTSH} || die
411    
412     is_loc_mounted "${CDCHROOTDIR}/dev" && umount ${CDCHROOTDIR}/dev
413     is_loc_mounted "${CDCHROOTDIR}/proc" && umount ${CDCHROOTDIR}/proc
414     is_loc_mounted "${CDCHROOTDIR}/sys" && umount ${CDCHROOTDIR}/sys
415    
416   # move initrd to isoroot   # move initrd to isoroot
417   install -d ${CDISOROOT}/isolinux || die   install -d ${CDISOROOT}/isolinux || die
418   mv ${CDCHROOTDIR}/initrd.gz ${CDISOROOT}/isolinux || die   mv ${CDCHROOTDIR}/initrd.gz ${CDISOROOT}/isolinux || die
# Line 267  generate_iso() Line 440  generate_iso()
440    
441  enter_livecd()  enter_livecd()
442  {  {
443   mount -t sysfs sysfs ${CDCHROOTDIR}/sys   is_loc_mounted "${CDCHROOTDIR}/sys" || mount -t sysfs sysfs ${CDCHROOTDIR}/sys
444   mount -t proc proc ${CDCHROOTDIR}/proc   is_loc_mounted "${CDCHROOTDIR}/proc" || mount -t proc proc ${CDCHROOTDIR}/proc
445   mount -o bind /dev ${CDCHROOTDIR}/dev   is_loc_mounted "${CDCHROOTDIR}/dev" || mount -o bind /dev ${CDCHROOTDIR}/dev
446    
447   chroot ${CDCHROOTDIR} \   chroot ${CDCHROOTDIR} \
448   /usr/bin/env -i \   /usr/bin/env -i \
# Line 281  enter_livecd() Line 454  enter_livecd()
454   no_proxy=${no_proxy} \   no_proxy=${no_proxy} \
455   /bin/bash -i   /bin/bash -i
456    
457   umount ${CDCHROOTDIR}/dev   is_loc_mounted "${CDCHROOTDIR}/dev" && umount ${CDCHROOTDIR}/dev
458   umount ${CDCHROOTDIR}/proc   is_loc_mounted "${CDCHROOTDIR}/proc" && umount ${CDCHROOTDIR}/proc
459   umount ${CDCHROOTDIR}/sys   is_loc_mounted "${CDCHROOTDIR}/sys" && umount ${CDCHROOTDIR}/sys
460    }
461    
462    is_loc_mounted()
463    {
464     local filesys
465     local i
466     filesys=$1
467    
468     i="$(cat /proc/mounts | grep " ${filesys} " | cut -d ' ' -f2)"
469     [[ ${i} != ${filesys} ]] && return 1
470    
471     return 0
472    }
473    
474    trap_exit()
475    {
476     is_loc_mounted "${CDCHROOTDIR}/dev" && umount ${CDCHROOTDIR}/dev
477     is_loc_mounted "${CDCHROOTDIR}/proc" && umount ${CDCHROOTDIR}/proc
478     is_loc_mounted "${CDCHROOTDIR}/sys" && umount ${CDCHROOTDIR}/sys
479  }  }
480    
481  usage()  usage()
# Line 305  usage() Line 497  usage()
497   echo   echo
498  }  }
499    
500    # set some proper traps
501    trap "trap_exit" SIGINT SIGQUIT
502    
503  # source profile config - overrides all other vars  # source profile config - overrides all other vars
504  [ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config  [ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config
505    

Legend:
Removed from v.1402  
changed lines
  Added in v.1531