From b626646cfc199d364df7a2b69cabda26e86f7c17 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 3 Jan 2009 20:47:07 +0000
Subject: [PATCH] Update doc

---
 rescue/linux/usb/README.usb               | 29 +++++++++++++++++++++++
 rescue/linux/usb/config                   |  4 ++--
 rescue/linux/usb/partition_usb_key        |  1 -
 rescue/linux/usb/write_usb_boot_partition |  7 ++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/rescue/linux/usb/README.usb b/rescue/linux/usb/README.usb
index dcae47b..31bbf90 100644
--- a/rescue/linux/usb/README.usb
+++ b/rescue/linux/usb/README.usb
@@ -2,6 +2,7 @@
 This directory is used to build a USB key containing a Kubuntu 8.04 LiveCD
 with persistent OS files and persistent /home files.
 
+You will need to run as root for most things ...
 
 Start by editing the "config" file. Be sure to get your USB_DEV
 definition correct.  The scripts you need to partition the key and 
@@ -38,6 +39,34 @@ When the key is booted, assuming you choose the first option
 (LiveCD), you will be running as user "ubuntu" the password is
 "bacula", and you will be in /home/ubuntu.  
 
+The next step is to get a copy of kubuntu8.tar.gz, which is the
+USB boot image. Currently, it can be downloaded from:
+
+  www.bacula.org/downloads/kubuntu8.tar.gz
+
+or from:
+
+  www.sibbald.com/download/kubuntu8.tar.gz
+
+I recommend that you download it into the rescue/linux/usb directory.
+
+Finally, mount your USB key and detar the kubuntu8.tar.gz image 
+into the first partition.  Do this with:
+
+   ./write_usb_boot_partition
+
+You should now have a USB stick that can be booted providing the
+machine permits booting from the USB port -- this can be adjusted
+by modifying the BIOS boot sequence.  On Dell machines, you can 
+enter the BIOS setup by pressing F2 just after power on.  
+
+Alternatively, most machines let you boot from an alternate device.
+For example if you press F11 while a Sony Viao is powering up, it 
+will boot from the USB port. 
+
+On Dell machines during power on, if you press F12, you will be
+able to select any boot device (one time only) other than the one
+that is the default (normally the CDROM or HDD).
 
 
 ====
diff --git a/rescue/linux/usb/config b/rescue/linux/usb/config
index 950c280..14c2cea 100644
--- a/rescue/linux/usb/config
+++ b/rescue/linux/usb/config
@@ -13,8 +13,9 @@ CWD=`pwd`
 #
 # If you are unsure remove the USB device and rerun the fdisk -l
 # If you get this wrong, your harddisk could be wiped out.
+# It is probably "sda" or "sdb" or "sdc" 
 #
-USB_DEV=/dev/sda
+USB_DEV=/dev/xxx
 
 #
 # When your USB key is mounted, what is the mount directory?
@@ -37,4 +38,3 @@ DISK_IMAGE=${CWD}/kubuntu8
 # If you are remastering a Ubuntu or Kubunto ISO (not normally done)
 # Point to the ISO image
 ISO_IMAGE=
-
diff --git a/rescue/linux/usb/partition_usb_key b/rescue/linux/usb/partition_usb_key
index 98c944e..6ef9bb4 100755
--- a/rescue/linux/usb/partition_usb_key
+++ b/rescue/linux/usb/partition_usb_key
@@ -45,7 +45,6 @@ p
 
 +750M
 t
-1
 6
 a
 1
diff --git a/rescue/linux/usb/write_usb_boot_partition b/rescue/linux/usb/write_usb_boot_partition
index be4c45f..a716469 100755
--- a/rescue/linux/usb/write_usb_boot_partition
+++ b/rescue/linux/usb/write_usb_boot_partition
@@ -19,6 +19,10 @@ umount ${USB_DEV}1 2>/dev/null 1>/dev/null
 
 echo "Reformat USB boot partition"
 mkfs.vfat -F 16 -n kubuntu8 ${USB_DEV}1
+if [ ! -d ${MOUNT_POINT}/kubuntu8 ] ; then
+   mkdir -p ${MOUNT_POINT}/kubuntu8
+   created="yes"
+fi
 mount ${USB_DEV}1 ${MOUNT_POINT}/kubuntu8
 if [ $? -ne 0 ] ; then
   echo "Mount of USB boot partition failed."
@@ -40,3 +44,6 @@ echo "syncing ..."
 sync
 sync
 umount ${MOUNT_POINT}/kubuntu8
+if [ "x$created" = "xyes" ] ; then
+   rmdir ${MOUNT_POINT}/kubuntu8
+fi
-- 
2.39.5