Reorganize directory structure

diff --git a/rescue/linux/usb/mount_iso b/rescue/linux/usb/mount_iso
deleted file mode 100755 (executable)
index 7bce790..0000000
--- a/rescue/linux/usb/mount_iso
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-. ./config
-
-mkdir -p cdrom
-mount -o loop -t iso9660 $ISO_IMAGE cdrom

diff --git a/rescue/linux/usb/pack_disk_image b/rescue/linux/usb/pack_disk_image
deleted file mode 100755 (executable)
index f7767b0..0000000
--- a/rescue/linux/usb/pack_disk_image
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# tar the disk image
-#
-. ./config
-
-rm -f kubuntu8.tar.gz
-cd $DISK_IMAGE
-# Update checksum
-find . -type f -print0 | xargs -0 md5sum >md5sum.txt
-tar cfz $CWD/kubuntu8.tar.gz .
-cd $CWD
-ls -l kubuntu8.tar.gz

diff --git a/rescue/linux/usb/pack_initrd b/rescue/linux/usb/pack_initrd
deleted file mode 100755 (executable)
index f3a1e67..0000000
--- a/rescue/linux/usb/pack_initrd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-cd initrd
-echo "Packing initrd to initrd.gz ..."
-find . | cpio -o -H newc | gzip -9 > ../initrd.gz
-if [ "x$SUID_UID" != "x" ] ; then
-  if [ "x$SUID_GID" = "x" ] ; then
-    chown $SUID_UID ../initrd.gz
-  else
-    chown $SUID_UID:$SUID_GID ../initrd.gz
-  fi  
-fi

diff --git a/rescue/linux/usb/pack_sqfs b/rescue/linux/usb/pack_sqfs
deleted file mode 100755 (executable)
index 927792b..0000000
--- a/rescue/linux/usb/pack_sqfs
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#
-rm -f filesystem.squashfs
-mksquashfs sqfs filesystem.squashfs

diff --git a/rescue/linux/usb/remaster/mount_iso b/rescue/linux/usb/remaster/mount_iso
new file mode 100755 (executable)
index 0000000..7bce790
--- /dev/null
+++ b/rescue/linux/usb/remaster/mount_iso
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+. ./config
+
+mkdir -p cdrom
+mount -o loop -t iso9660 $ISO_IMAGE cdrom

diff --git a/rescue/linux/usb/remaster/pack_disk_image b/rescue/linux/usb/remaster/pack_disk_image
new file mode 100755 (executable)
index 0000000..f7767b0
--- /dev/null
+++ b/rescue/linux/usb/remaster/pack_disk_image
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# tar the disk image
+#
+. ./config
+
+rm -f kubuntu8.tar.gz
+cd $DISK_IMAGE
+# Update checksum
+find . -type f -print0 | xargs -0 md5sum >md5sum.txt
+tar cfz $CWD/kubuntu8.tar.gz .
+cd $CWD
+ls -l kubuntu8.tar.gz

diff --git a/rescue/linux/usb/remaster/pack_initrd b/rescue/linux/usb/remaster/pack_initrd
new file mode 100755 (executable)
index 0000000..f3a1e67
--- /dev/null
+++ b/rescue/linux/usb/remaster/pack_initrd
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+cd initrd
+echo "Packing initrd to initrd.gz ..."
+find . | cpio -o -H newc | gzip -9 > ../initrd.gz
+if [ "x$SUID_UID" != "x" ] ; then
+  if [ "x$SUID_GID" = "x" ] ; then
+    chown $SUID_UID ../initrd.gz
+  else
+    chown $SUID_UID:$SUID_GID ../initrd.gz
+  fi  
+fi

diff --git a/rescue/linux/usb/remaster/pack_sqfs b/rescue/linux/usb/remaster/pack_sqfs
new file mode 100755 (executable)
index 0000000..927792b
--- /dev/null
+++ b/rescue/linux/usb/remaster/pack_sqfs
@@ -0,0 +1,4 @@
+#!/bin/sh
+#
+rm -f filesystem.squashfs
+mksquashfs sqfs filesystem.squashfs

diff --git a/rescue/linux/usb/remaster/unmount_iso b/rescue/linux/usb/remaster/unmount_iso
new file mode 100755 (executable)
index 0000000..18686f7
--- /dev/null
+++ b/rescue/linux/usb/remaster/unmount_iso
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+
+umount cdrom
+if [ $? -eq 0 ] ; then
+  rmdir cdrom
+fi

diff --git a/rescue/linux/usb/remaster/unpack_initrd b/rescue/linux/usb/remaster/unpack_initrd
new file mode 100755 (executable)
index 0000000..4874fa3
--- /dev/null
+++ b/rescue/linux/usb/remaster/unpack_initrd
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+rm -rf initrd
+mkdir -p initrd
+cd initrd
+echo "Unpacking initrd.gz into initrd ..."
+gzip -dc ../cdrom/casper/initrd.gz | cpio -i

diff --git a/rescue/linux/usb/remaster/unpack_sqfs b/rescue/linux/usb/remaster/unpack_sqfs
new file mode 100755 (executable)
index 0000000..458f7f7
--- /dev/null
+++ b/rescue/linux/usb/remaster/unpack_sqfs
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+mkdir -p sqfs
+mkdir cdsqfs
+mount -o loop -t squashfs cdrom/casper/filesystem.squashfs cdsqfs
+if [ $? -ne 0 ] ; then
+  echo "Error mounting squashfs ..."
+  rm -rf cdsqfs
+  exit 1
+fi
+echo "Copying ISO squashfs to sqfs ..."
+rsync -avx -P cdsqfs/. sqfs/.
+#
+umount cdsqfs/
+if [ $? -ne 0 ] ; then
+  umount cdsqfs/
+  if [ $? -ne 0 ] ; then
+     echo "Could not umount cdsqfs ..."
+     exit 1
+  fi
+fi
+rmdir cdsqfs

diff --git a/rescue/linux/usb/remaster/update_disk_image b/rescue/linux/usb/remaster/update_disk_image
new file mode 100644 (file)
index 0000000..640f097
--- /dev/null
+++ b/rescue/linux/usb/remaster/update_disk_image
@@ -0,0 +1,12 @@
+#!/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
new file mode 100644 (file)
index 0000000..4f51aed
--- /dev/null
+++ b/rescue/linux/usb/remaster/update_packages
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# Update squashfs -- assumes you start with a Hardy 8.04.1 desktop,
+#   but it should work even if you have already updated it.
+#
+
+chroot sqfs /bin/sh
+mount -t proc none /proc/
+mount -t sysfs non /sys/
+export HOME=/root
+
+# remove packages
+apt-get remove --purge `dpkg-query -W --showformat '${Package}\n' | grep language-pack | egrep -v '\-en'`
+apt-get remove --purge `dpkg-query -W --showformat '${Package}\n' | grep openoffice\.org-`
+apt-get remove --purge amarok dictionaries-common
+
+cat >/etc/apt/sources.list <<EOF
+deb http://archive.ubuntu.com/ubuntu/ hardy main restricted
+deb http://archive.ubuntu.com/ubuntu/ hardy-updates main restricted
+deb http://archive.ubuntu.com/ubuntu/ hardy universe
+deb http://archive.ubuntu.com/ubuntu/ hardy-updates universe
+deb http://archive.ubuntu.com/ubuntu/ hardy multiverse
+deb http://archive.ubuntu.com/ubuntu/ hardy-security main restricted
+deb http://archive.ubuntu.com/ubuntu/ hardy-security universe
+deb http://archive.ubuntu.com/ubuntu/ hardy-security multiverse
+deb http://archive.ubuntu.com/ubuntu/ hardy-updates multiverse
+EOF
+apt-get update
+apt-get upgrade
+
+# Add new packages
+apt-get install openssh-server subversion kdetoys kicker-applets kgpg gftp \
+  firefox sg3-utils
+apt-get install flashplugin-nonfree aircrack-ng g++ nvidia-glx-new gfxboot \
+  syslinux mtools
+
+# Add heldback packages
+apt-get install bind9-host dnsutils libbind9-30 libisccc30 libisccfg30 \
+  linux-generic linux-headers-generic linux-image-generic \
+  linux-restricted-modules-generic ssl-cert
+
+# Remove old kernel
+apt-get remove linux-headers-2.6.24-19 linux-headers-2.6.24-19-generic \
+  linux-image-2.6.24-19-generic linux-restricted-modules-2.6.24-19-generic \
+  linux-restricted-modules-2.6.24-22-generic linux-ubuntu-modules-2.6.24-19-generic
+
+cd /
+dpkg-query -W --showformat='${Package} ${Version}\n' >filesystem.manifest
+
+apt-get clean
+rm -rf /tmp/*
+rm -f /etc/hosts /etc/resolv.conf
+umount /proc/
+umount /sys/
+exit
+cp sqfs/filesystem.manifest .
+rm -f sqfs/filsystem.manifest

diff --git a/rescue/linux/usb/remaster/update_sqfs b/rescue/linux/usb/remaster/update_sqfs
new file mode 100755 (executable)
index 0000000..8cf2836
--- /dev/null
+++ b/rescue/linux/usb/remaster/update_sqfs
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+#  Put a new squashfs on the disk image
+#
+
+. ./config
+
+
+if [ ! -d ${DISK_IMAGE}/casper ] ; then
+  echo "Cannot find ${DISK_IMAGE}/casper directory -- possibly not detarred"
+  exit 1
+fi
+
+echo "Removing old squashfs"
+rm -f ${DISK_IMAGE}/casper/filesystem.squashfs ${DISK_IMAGE}/casper/filesystem.manifest 
+rm -f ${DISK_IMAGE}/casper/filesystem.manifest-desktop
+
+echo "Copying new squashfs"
+cp filesystem.manifest ${DISK_IMAGE}/casper/
+cp filesystem.manifest ${DISK_IMAGE}/casper/filesystem.manifest-desktop
+cp filesystem.squashfs ${DISK_IMAGE}/casper/
+sync

diff --git a/rescue/linux/usb/unmount_iso b/rescue/linux/usb/unmount_iso
deleted file mode 100755 (executable)
index 18686f7..0000000
--- a/rescue/linux/usb/unmount_iso
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-
-umount cdrom
-if [ $? -eq 0 ] ; then
-  rmdir cdrom
-fi

diff --git a/rescue/linux/usb/unpack_initrd b/rescue/linux/usb/unpack_initrd
deleted file mode 100755 (executable)
index 4874fa3..0000000
--- a/rescue/linux/usb/unpack_initrd
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-rm -rf initrd
-mkdir -p initrd
-cd initrd
-echo "Unpacking initrd.gz into initrd ..."
-gzip -dc ../cdrom/casper/initrd.gz | cpio -i

diff --git a/rescue/linux/usb/unpack_sqfs b/rescue/linux/usb/unpack_sqfs
deleted file mode 100755 (executable)
index 458f7f7..0000000
--- a/rescue/linux/usb/unpack_sqfs
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-mkdir -p sqfs
-mkdir cdsqfs
-mount -o loop -t squashfs cdrom/casper/filesystem.squashfs cdsqfs
-if [ $? -ne 0 ] ; then
-  echo "Error mounting squashfs ..."
-  rm -rf cdsqfs
-  exit 1
-fi
-echo "Copying ISO squashfs to sqfs ..."
-rsync -avx -P cdsqfs/. sqfs/.
-#
-umount cdsqfs/
-if [ $? -ne 0 ] ; then
-  umount cdsqfs/
-  if [ $? -ne 0 ] ; then
-     echo "Could not umount cdsqfs ..."
-     exit 1
-  fi
-fi
-rmdir cdsqfs

diff --git a/rescue/linux/usb/update_disk_image b/rescue/linux/usb/update_disk_image
deleted file mode 100644 (file)
index 640f097..0000000
--- a/rescue/linux/usb/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/update_packages b/rescue/linux/usb/update_packages
deleted file mode 100644 (file)
index 4f51aed..0000000
--- a/rescue/linux/usb/update_packages
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# Update squashfs -- assumes you start with a Hardy 8.04.1 desktop,
-#   but it should work even if you have already updated it.
-#
-
-chroot sqfs /bin/sh
-mount -t proc none /proc/
-mount -t sysfs non /sys/
-export HOME=/root
-
-# remove packages
-apt-get remove --purge `dpkg-query -W --showformat '${Package}\n' | grep language-pack | egrep -v '\-en'`
-apt-get remove --purge `dpkg-query -W --showformat '${Package}\n' | grep openoffice\.org-`
-apt-get remove --purge amarok dictionaries-common
-
-cat >/etc/apt/sources.list <<EOF
-deb http://archive.ubuntu.com/ubuntu/ hardy main restricted
-deb http://archive.ubuntu.com/ubuntu/ hardy-updates main restricted
-deb http://archive.ubuntu.com/ubuntu/ hardy universe
-deb http://archive.ubuntu.com/ubuntu/ hardy-updates universe
-deb http://archive.ubuntu.com/ubuntu/ hardy multiverse
-deb http://archive.ubuntu.com/ubuntu/ hardy-security main restricted
-deb http://archive.ubuntu.com/ubuntu/ hardy-security universe
-deb http://archive.ubuntu.com/ubuntu/ hardy-security multiverse
-deb http://archive.ubuntu.com/ubuntu/ hardy-updates multiverse
-EOF
-apt-get update
-apt-get upgrade
-
-# Add new packages
-apt-get install openssh-server subversion kdetoys kicker-applets kgpg gftp \
-  firefox sg3-utils
-apt-get install flashplugin-nonfree aircrack-ng g++ nvidia-glx-new gfxboot \
-  syslinux mtools
-
-# Add heldback packages
-apt-get install bind9-host dnsutils libbind9-30 libisccc30 libisccfg30 \
-  linux-generic linux-headers-generic linux-image-generic \
-  linux-restricted-modules-generic ssl-cert
-
-# Remove old kernel
-apt-get remove linux-headers-2.6.24-19 linux-headers-2.6.24-19-generic \
-  linux-image-2.6.24-19-generic linux-restricted-modules-2.6.24-19-generic \
-  linux-restricted-modules-2.6.24-22-generic linux-ubuntu-modules-2.6.24-19-generic
-
-cd /
-dpkg-query -W --showformat='${Package} ${Version}\n' >filesystem.manifest
-
-apt-get clean
-rm -rf /tmp/*
-rm -f /etc/hosts /etc/resolv.conf
-umount /proc/
-umount /sys/
-exit
-cp sqfs/filesystem.manifest .
-rm -f sqfs/filsystem.manifest

diff --git a/rescue/linux/usb/update_sqfs b/rescue/linux/usb/update_sqfs
deleted file mode 100755 (executable)
index 8cf2836..0000000
--- a/rescue/linux/usb/update_sqfs
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-#  Put a new squashfs on the disk image
-#
-
-. ./config
-
-
-if [ ! -d ${DISK_IMAGE}/casper ] ; then
-  echo "Cannot find ${DISK_IMAGE}/casper directory -- possibly not detarred"
-  exit 1
-fi
-
-echo "Removing old squashfs"
-rm -f ${DISK_IMAGE}/casper/filesystem.squashfs ${DISK_IMAGE}/casper/filesystem.manifest 
-rm -f ${DISK_IMAGE}/casper/filesystem.manifest-desktop
-
-echo "Copying new squashfs"
-cp filesystem.manifest ${DISK_IMAGE}/casper/
-cp filesystem.manifest ${DISK_IMAGE}/casper/filesystem.manifest-desktop
-cp filesystem.squashfs ${DISK_IMAGE}/casper/
-sync