From 29a3de6f4cf677638348e6678b088bdb751a823b Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 3 Jan 2009 16:10:43 +0000
Subject: [PATCH] Update

---
 rescue/linux/usb/remaster/pack_initrd       |  4 ++++
 rescue/linux/usb/remaster/update_disk_image | 12 ------------
 rescue/linux/usb/remaster/update_packages   |  4 ++++
 3 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 rescue/linux/usb/remaster/update_disk_image

diff --git a/rescue/linux/usb/remaster/pack_initrd b/rescue/linux/usb/remaster/pack_initrd
index f3a1e67..bd5677f 100755
--- a/rescue/linux/usb/remaster/pack_initrd
+++ b/rescue/linux/usb/remaster/pack_initrd
@@ -1,5 +1,9 @@
 #!/bin/sh
 #
+if [ ! -d initrd ] ; then
+  echo "Cannot find initrd directory."
+  exit 1
+fi
 cd initrd
 echo "Packing initrd to initrd.gz ..."
 find . | cpio -o -H newc | gzip -9 > ../initrd.gz
diff --git a/rescue/linux/usb/remaster/update_disk_image b/rescue/linux/usb/remaster/update_disk_image
deleted file mode 100644
index 640f097..0000000
--- a/rescue/linux/usb/remaster/update_disk_image
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# Update the disk image with a new squashfs
-#
-. ./config
-
-rm -f $DISK_IMAGE/casper/filesystem.squashfs
-rm -f $DISK_IMAGE/casper/filesystem.mainfest
-rm -f $DISK_IMAGE/casper/filesystem.mainfest-desktop
-cp filesystem.squashfs $DISK_IMAGE/casper/filesystem.squashfs
-cp filesystem.mainfest $DISK_IMAGE/casper/filesystem.mainfest
-cp filesystem.mainfest $DISK_IMAGE/casper/filesystem.mainfest-desktop
diff --git a/rescue/linux/usb/remaster/update_packages b/rescue/linux/usb/remaster/update_packages
index 4f51aed..b990001 100644
--- a/rescue/linux/usb/remaster/update_packages
+++ b/rescue/linux/usb/remaster/update_packages
@@ -4,6 +4,10 @@
 #   but it should work even if you have already updated it.
 #
 
+if [ ! -d sqfs ] ; then
+  echo "Cannot find squashfs (sqfs directory)"
+  exit 1
+fi
 chroot sqfs /bin/sh
 mount -t proc none /proc/
 mount -t sysfs non /sys/
-- 
2.39.2