diff -Nru uck-2.4.7+repack0/debian/changelog uck-2.4.7+repack0/debian/changelog --- uck-2.4.7+repack0/debian/changelog 2013-07-14 21:23:24.000000000 +0000 +++ uck-2.4.7+repack0/debian/changelog 2013-08-08 10:45:09.000000000 +0000 @@ -1,3 +1,18 @@ +uck (2.4.7+repack0-0pmjdebruijn4~precise) precise; urgency=low + + * [PATCH] uck-fix-grub-maybe-ubiquity.patch + * [PATCH] uck-clean-var-crash-and-random-seed.patch + + -- Pascal de Bruijn Thu, 08 Aug 2013 12:38:30 +0200 + +uck (2.4.7+repack0-0pmjdebruijn3~precise) precise; urgency=low + + * Revised patches: + - [PATCH] uck-memtest.patch + - [PATCH] uck-squash.patch + + -- Pascal de Bruijn Sat, 27 Jul 2013 11:31:44 +0200 + uck (2.4.7+repack0-0pmjdebruijn2~precise) precise; urgency=low * [PATCH] uck-efi-fix.patch diff -Nru uck-2.4.7+repack0/debian/patches/series uck-2.4.7+repack0/debian/patches/series --- uck-2.4.7+repack0/debian/patches/series 2013-07-14 21:23:06.000000000 +0000 +++ uck-2.4.7+repack0/debian/patches/series 2013-08-08 10:43:09.000000000 +0000 @@ -2,3 +2,5 @@ uck-squash.patch uck-efi-fix.patch uck-iso-efi.patch +uck-fix-grub-maybe-ubiquity.patch +uck-clean-var-crash-and-random-seed.patch diff -Nru uck-2.4.7+repack0/debian/patches/uck-clean-var-crash-and-random-seed.patch uck-2.4.7+repack0/debian/patches/uck-clean-var-crash-and-random-seed.patch --- uck-2.4.7+repack0/debian/patches/uck-clean-var-crash-and-random-seed.patch 1970-01-01 00:00:00.000000000 +0000 +++ uck-2.4.7+repack0/debian/patches/uck-clean-var-crash-and-random-seed.patch 2013-08-08 10:46:22.000000000 +0000 @@ -0,0 +1,15 @@ +diff -Nurpd uck-code-orig/libraries/remaster-live-cd.sh uck-code-new/libraries/remaster-live-cd.sh +--- uck-code-orig/libraries/remaster-live-cd.sh 2013-07-08 22:49:51.487268167 +0200 ++++ uck-code-new/libraries/remaster-live-cd.sh 2013-08-08 12:41:43.783570336 +0200 +@@ -458,7 +464,10 @@ function clean_rootfs_after_chroot() + fi + + echo "Removing crash reports..." +- chroot "$REMASTER_DIR" rm -f /var/crash/* ++ chroot "$REMASTER_DIR" sh -c "rm -f /var/crash/*" ++ ++ echo "Removing random-seed if present..." ++ chroot "$REMASTER_DIR" rm -f /var/lib/urandom/random-seed + + unmount_pseudofilesystems + diff -Nru uck-2.4.7+repack0/debian/patches/uck-fix-grub-maybe-ubiquity.patch uck-2.4.7+repack0/debian/patches/uck-fix-grub-maybe-ubiquity.patch --- uck-2.4.7+repack0/debian/patches/uck-fix-grub-maybe-ubiquity.patch 1970-01-01 00:00:00.000000000 +0000 +++ uck-2.4.7+repack0/debian/patches/uck-fix-grub-maybe-ubiquity.patch 2013-08-08 10:46:07.000000000 +0000 @@ -0,0 +1,33 @@ +diff -Nurpd uck-code-orig/libraries/remaster-live-cd.sh uck-code-new/libraries/remaster-live-cd.sh +--- uck-code-orig/libraries/remaster-live-cd.sh 2013-07-08 22:49:51.487268167 +0200 ++++ uck-code-new/libraries/remaster-live-cd.sh 2013-08-08 12:34:35.825448213 +0200 +@@ -397,8 +397,11 @@ function prepare_rootfs_for_chroot() + chroot "$REMASTER_DIR" ln -s /bin/true /usr/sbin/grub-probe + + echo "Hacking grub-probe postinst/postrm..." +- chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/#exec update-grub/" /etc/kernel/postinst.d/zz-update-grub +- chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/#exec update-grub/" /etc/kernel/postrm.d/zz-update-grub ++ chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/echo inhibited #exec update-grub/" /etc/kernel/postinst.d/zz-update-grub ++ chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/echo inhibited #exec update-grub/" /etc/kernel/postrm.d/zz-update-grub ++ ++ echo "Workaround for 48xubuntu_maybe_ubiquity..." ++ chroot "$REMASTER_DIR" ln -s /usr/share/initramfs-tools/scripts /scripts + + echo "Remembering kernel update state..." + update_flags="reboot-required reboot-required.pkgs do-not-hibernate" +@@ -432,9 +435,12 @@ function clean_rootfs_after_chroot() + chroot "$REMASTER_DIR" rm /usr/sbin/grub-probe + chroot "$REMASTER_DIR" mv /usr/sbin/grub-probe.uck_blocked /usr/sbin/grub-probe + ++ echo "Removing workaround for 48xubuntu_maybe_ubiquity..." ++ chroot "$REMASTER_DIR" rm /scripts ++ + echo "Reactivating grub-probe postinst/postrm..." +- chroot "$REMASTER_DIR" sed -i -e "s/#exec update-grub/exec update-grub/" /etc/kernel/postinst.d/zz-update-grub +- chroot "$REMASTER_DIR" sed -i -e "s/#exec update-grub/exec update-grub/" /etc/kernel/postrm.d/zz-update-grub ++ chroot "$REMASTER_DIR" sed -i -e "s/echo inhibited #exec update-grub/exec update-grub/" /etc/kernel/postinst.d/zz-update-grub ++ chroot "$REMASTER_DIR" sed -i -e "s/echo inhibited #exec update-grub/exec update-grub/" /etc/kernel/postrm.d/zz-update-grub + + UCK_USER_HOME_DIR=`xauth info|grep 'Authority file'| sed "s/[ \t]//g" | sed "s/\/\.Xauthority//" | cut -d ':' -f2` + if [ `echo $UCK_USER_HOME_DIR | cut -d '/' -f2` == 'home' ] ; then + diff -Nru uck-2.4.7+repack0/debian/patches/uck-iso-efi.patch uck-2.4.7+repack0/debian/patches/uck-iso-efi.patch --- uck-2.4.7+repack0/debian/patches/uck-iso-efi.patch 2013-07-16 16:56:36.000000000 +0000 +++ uck-2.4.7+repack0/debian/patches/uck-iso-efi.patch 2013-07-27 09:30:36.000000000 +0000 @@ -96,17 +96,20 @@ RESULT=$? if [ $RESULT -ne 0 ]; then -@@ -668,6 +691,19 @@ function pack_iso() +@@ -668,6 +691,22 @@ function pack_iso() failure "You asked for a hybrid ISO but isohybrid command was not found" fi fi + -+ if [ -n `which implantisomd5` ] ; then ++ IMPLANTISOMD5=`which implantisomd5` ++ if [ -n "$IMPLANTISOMD5" ] ; then + echo "Implanting ISO MD5..." -+ implantisomd5 --force "$NEW_FILES_DIR/$NEW_ISO_FILE_NAME" -+ if [ -n `which checkisomd5` ] ; then ++ $IMPLANTISOMD5 --force "$NEW_FILES_DIR/$NEW_ISO_FILE_NAME" ++ ++ CHECKISOMD5=`which checkisomd5` ++ if [ -n "$CHECKISOMD5" ] ; then + echo "Checking implanted ISO MD5..." -+ checkisomd5 "$NEW_FILES_DIR/$NEW_ISO_FILE_NAME" ++ $CHECKISOMD5 "$NEW_FILES_DIR/$NEW_ISO_FILE_NAME" + else + echo "Skipping check of implated MD5..." + fi @@ -136,7 +139,7 @@ + # uppercase user name from passwd by default as it seems common practise to use uppercase in ISO9660 metadata fields + ISO_PUBLISHER=`getent passwd $USER | awk -F ':' '{print $5}' | awk -F ',' '{print $1}' | tr 'a-z' 'A-Z'` + -+ ISO_PUBLISHER=`dialog_line_input "Please enter the name for your CD (you can leave it blank, 32 chars max)" "$ISO_PUBLISHER"` ++ ISO_PUBLISHER=`dialog_line_input "Please enter the publisher for your CD (you can leave it blank, 32 chars max)" "$ISO_PUBLISHER"` + RESULT=$? + + if [ $RESULT -ne 0 ] ; then