Got archiso into working condition

Several small changes just as a shim to get everything to work.

Signed-off-by: Simo Leone <simo@archlinux.org>

7 files changed, 12 insertions, 12 deletions

diff --git a/TODO b/TODO
index 2081e94..224da2e 100644
--- a/TODO
+++ b/TODO
@@ -8,3 +8,5 @@
   graphics to all submenus
 
 * possible auto-detection of installed systems via nifty grub tricks?
+
+* use system's package cache when generating install to save some bandwidth (use mkarchroot?)
diff --git a/hooks/archiso b/hooks/archiso
index c60df2b..3d9e7ec 100644
--- a/hooks/archiso
+++ b/hooks/archiso
@@ -6,7 +6,6 @@ run_hook ()
     fi
     msg -n ":: Mounting tmpfs, size=${ramdisk_size}..."
 	mount -t tmpfs -o "size=${ramdisk_size}" tmpfs /tmpfs
-    mkdir /tmpfs/bootcd
     msg "done."
 
     if [ "x${BOOT_MOUNT}" -eq "x" ]; then
diff --git a/hooks/boot-cd b/hooks/boot-cd
index d6d9da6..a730412 100644
--- a/hooks/boot-cd
+++ b/hooks/boot-cd
@@ -3,14 +3,14 @@ run_hook ()
 {
     msg ":: Scanning for boot cdrom device..."
 
-    /bin/mkdir -p /tmpfs/bootmnt
-    bootmnt="/tmpfs/bootmnt/"
+    /bin/mkdir -p /bootmnt
+    bootmnt="/bootmnt/"
     found=0
 
     /bin/modprobe -q isofs >/dev/null 2>&1
     for cdrom in /dev/cd/*; do
         if mount -r -t iso9660 "${cdrom}" ${bootmnt} >/dev/null 2>&1; then
-            if [ -e "${bootmnt}/archiso.sqfs" ]; then
+            if [ -e "${bootmnt}/archlive.sqfs" ]; then
                 found=1
                 msg "${cdrom}"
                 break
diff --git a/install/archiso b/install/archiso
index d75a57e..ff3f64a 100644
--- a/install/archiso
+++ b/install/archiso
@@ -6,5 +6,5 @@ install ()
     FILES=""
     add_dir /real_root
     add_dir /tmpfs
-    SCRIPT="archlive"
+    SCRIPT="archiso"
 }
diff --git a/install/boot-cd b/install/boot-cd
index b7e82ae..10577a9 100644
--- a/install/boot-cd
+++ b/install/boot-cd
@@ -4,5 +4,5 @@ install ()
     MODULES="cdrom ide-cd ide-core ide-generic unionfs squashfs isofs $(all_modules '/kernel/fs' | grep -v "nls") "
     BINARIES=""
     FILES=""
-    SCRIPT="from-cd"
+    SCRIPT="boot-cd"
 }
diff --git a/mkarchiso b/mkarchiso
index 4710a15..f857103 100755
--- a/mkarchiso
+++ b/mkarchiso
@@ -78,9 +78,8 @@ fi
 
 _kversion ()
 {
-    echo $(pacman -Ql -r "${instroot}" "${kernelpkg}" |\
-           grep "/lib/modules/[^/]*/$" |\
-           sed "s|.*/lib/modules/\([^/]*\).*/$|\1|")
+    source ${instroot}/etc/mkinitcpio.d/kernel26.kver
+    echo ${ALL_kver}
 }
 
 _pacman ()
@@ -94,7 +93,7 @@ _pacman ()
     
     FAKEROOTSAV=$FAKEROOTKEY; unset FAKEROOTKEY
     #TODO this grep is a tad weird...
-    if ! eval "${fkchroot} pacman -Sf --noconfirm -r \"${instroot}\" $*" | grep "\[#"; then
+    if ! eval "${fkchroot} pacman -Sf --noconfirm -r \"${instroot}\" $*"; then
         exit 1
     fi
     FAKEROOTKEY=$FAKEROOTSAV
@@ -127,7 +126,7 @@ if [ "${command_name}" = "install" -o "${command_name}" = "all" ]; then
     mkdir -p "${instroot}"
 
     FAKEROOTSAV=$FAKEROOTKEY; unset FAKEROOTKEY
-    if ! pacman -Sy -r "${instroot}"  2>&1 | grep -v "cannot open logfile"; then
+    if ! pacman -Sy -r "${instroot}" | grep -v "cannot open logfile"; then
         echo "Error, failed to sync pacman... aborting."
         exit 1
     fi
diff --git a/packages/base.packages b/packages/base.packages
index 65ed501..a337d20 100644
--- a/packages/base.packages
+++ b/packages/base.packages
@@ -39,6 +39,7 @@ lzo2
 mailx
 man
 man-pages
+mdadm
 memtest86+
 mktemp
 module-init-tools
@@ -63,7 +64,6 @@ procinfo
 procps
 psmisc
 python
-raidtools
 readline
 reiserfsprogs
 rp-pppoe