Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archlive_hook23
-rw-r--r--archlive_install4
-rwxr-xr-xmkarchiso16
3 files changed, 26 insertions, 17 deletions
diff --git a/archlive_hook b/archlive_hook
index 12d14c8..754c266 100644
--- a/archlive_hook
+++ b/archlive_hook
@@ -10,14 +10,21 @@ run_hook ()
msg "done."
squashfound=0
+ #TODO check for usb devices as well...
msg -n ":: Scanning for boot cdrom device..."
+ squashimg="/tmpfs/bootcd/archlive.sqfs"
+
+ /bin/modprobe -q isofs >/dev/null 2>&1
+ PS1="ramfs$ " /bin/sh -i
for cdrom in /dev/cd/*; do
- if mount -r -t iso9660 "${cdrom}" /tmpfs/bootcd >/dev/null 2>&1; then
- if [ -e /tmpfs/bootcd/archlive.sqfs ]; then
+ if mount -r -t isofs "${cdrom}" /tmpfs/bootcd >/dev/null 2>&1; then
+ if [ -e "${squashimg}" ]; then
squashfound=1
msg "${cdrom}"
break
fi
+ else
+ echo "Failed to mount ${cdrom}"
fi
[ ${squashfound} -eq 0 ] && umount /tmpfs/bootcd >/dev/null 2>&1
done
@@ -27,15 +34,20 @@ run_hook ()
exit 1
fi
+ if [ "${copytoram}" == "y" ]; then
+ /bin/cat /tmpfs/bootcd/archlive.sqfs > /tmpfs/archlive.sqfs
+ squashimg="/tmpfs/archlive.sqfs"
+ fi
+
msg -n ":: Mounting squashfs image..."
/bin/modprobe -q squashfs >/dev/null 2>&1
/bin/mkdir -p /tmpfs/squashfs_root
- if ! /bin/losetup /dev/loop0 /tmpfs/bootcd/archlive.sqfs; then
+ if ! /bin/losetup /dev/loop0 "${squashimg}"; then
echo "ERROR: Cannot mount loop device /dev/loop0...aborting"
exit 1
fi
+
/bin/mount -r -t squashfs /dev/loop0 /tmpfs/squashfs_root
- #mount.full -r -t squashfs -o loop /tmpfs/bootcd/squashfs_image /tmpfs/squashfs_root
msg "done."
msg -n ":: Mounting root (union) filesystem..."
@@ -52,5 +64,8 @@ run_hook ()
[ "x${udevpid}" != "x" ] && /bin/kill -9 $udevpid 2>&1 >/dev/null
#Yep, we're bailing out here. We don't need kinit.
msg ":: Passing control to Archlinux Initscripts...Please Wait"
+ /bin/umount /sys
+ /bin/umount /proc
+ /bin/umount /dev
exec /bin/run-init -c /dev/console /real_root /sbin/init ${CMDLINE}
}
diff --git a/archlive_install b/archlive_install
index be2f5cc..bdb5857 100644
--- a/archlive_install
+++ b/archlive_install
@@ -1,11 +1,11 @@
# vim: set ft=sh:
install ()
{
- MODULES="cdrom ide-cd ide-core ide-generic unionfs squashfs iso9660 $(all_modules '/kernel/fs' | grep -v "nls") "
+ MODULES="cdrom ide-cd ide-core ide-generic unionfs squashfs isofs $(all_modules '/kernel/fs' | grep -v "nls") "
BINARIES=""
FILES=""
add_binary /bin/mount /bin/mount.full
add_dir /real_root
add_dir /tmpfs
- SCRIPT="liveiso"
+ SCRIPT="archlive"
}
diff --git a/mkarchiso b/mkarchiso
index 219147f..aecdac3 100755
--- a/mkarchiso
+++ b/mkarchiso
@@ -108,7 +108,7 @@ _kversion ()
_safepacman ()
{
FAKEROOTSAV=$FAKEROOTKEY; unset FAKEROOTKEY
- if ! pacman -Sf --noconfirm -r "${instroot}" $* >/dev/null 2>&1; then
+ if ! pacman -Sf --noconfirm -r "${instroot}" $* 2>&1 | grep "\[#"; then
echo "pacman failed to install '$*', aborting..."
exit 1
fi
@@ -118,12 +118,9 @@ safe_install_pkgfile ()
{
if [ -e "${1}" ]; then
toinstall=""
- echo " Installing packages:"
while read pkg; do
#skip packages listed in IGNOREPKGS
- echo $ignorepkgs | grep "\<$name\>" >/dev/null 2>&1 && continue
-
- echo " ${pkg}"
+ echo $ignorepkgs | grep "\<$pkg\>" >/dev/null 2>&1 && continue
toinstall="${toinstall} ${pkg}"
done < ${1}
_safepacman "${toinstall}"
@@ -133,7 +130,7 @@ safe_install_pkgfile ()
_pacman ()
{
FAKEROOTSAV=$FAKEROOTKEY; unset FAKEROOTKEY
- if ! fakechroot pacman -Sf --noconfirm -r "${instroot}" $* >/dev/null 2>&1; then
+ if ! fakechroot pacman -Sf --noconfirm -r "${instroot}" $* 2>&1 | grep "\[#"; then
echo "pacman failed to install '$*', aborting..."
exit 1
fi
@@ -144,12 +141,8 @@ install_pkgfile ()
{
if [ -e "${1}" ]; then
toinstall=""
- echo " Installing packages:"
while read pkg; do
- #skip packages listed in IGNOREPKGS
- echo $ignorepkgs | grep "\<$name\>" >/dev/null 2>&1 && continue
-
- echo " ${pkg}"
+ echo $ignorepkgs | grep "\<$pkg\>" >/dev/null 2>&1 && continue
toinstall="${toinstall} ${pkg}"
done < ${1}
_pacman "${toinstall}"
@@ -273,6 +266,7 @@ if [ "${SKIP_ISO}" = "n" ]; then
echo "Creating ISO image..."
mkisofs ${q} -r -l -b "boot/grub/stage2_eltorito" -uid 0 -gid 0 -no-emul-boot \
-boot-load-size 4 -boot-info-table -publisher "Arch Linux <archlinux.org>" \
+ -input-charset=UTF-8 \
-p "prepared by $NAME" -A "Arch Linux Live/Rescue CD" -copyright /etc/copyright \
-o "${isoname}" "${isoroot}"
fi