summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-10-31 16:34:56 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-10-31 16:34:56 +0100
commit5356859d1b9a8155007d2f79a880b8ac5ba8a15e (patch)
treea19c5f57186d5424949c07ff727ab8296fae36fa /src
parent206d0be73bad09eff69a582c7499aaddc98ebf15 (diff)
fixes related to package list/file
Diffstat (limited to 'src')
-rw-r--r--src/lib/lib-blockdevices-filesystems.sh1
-rw-r--r--src/profiles/profile-base6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/lib-blockdevices-filesystems.sh b/src/lib/lib-blockdevices-filesystems.sh
index e26efed..101b737 100644
--- a/src/lib/lib-blockdevices-filesystems.sh
+++ b/src/lib/lib-blockdevices-filesystems.sh
@@ -12,6 +12,7 @@ target_special_fs ()
! [ -d $TARGET_DIR/proc ] && mkdir $TARGET_DIR/proc
! [ -d $TARGET_DIR/sys ] && mkdir $TARGET_DIR/sys
! [ -d $TARGET_DIR/dev ] && mkdir $TARGET_DIR/dev
+ #TODO: check mtab if not mounted already
mount -t proc none $TARGET_DIR/proc || die_error "Could not mount $TARGET_DIR/proc" #NOTE: setup script uses mount -t proc proc ? what's best?
mount -t sysfs none $TARGET_DIR/sys || die_error "Could not mount $TARGET_DIR/sys" # NOTE: setup script uses mount -t sysfs sysfs ? what's best?
mount -o bind /dev $TARGET_DIR/dev || die_error "Could not mount $TARGET_DIR/dev"
diff --git a/src/profiles/profile-base b/src/profiles/profile-base
index 914898a..4c5f77c 100644
--- a/src/profiles/profile-base
+++ b/src/profiles/profile-base
@@ -4,6 +4,7 @@ var_DEFAULTFS="/boot:32:ext2:+ swap:256:swap /:7500:ext3 /home:*:ext3"
var_DESTDIR="/mnt"
var_RUNTIME_PACKAGES=
var_PKG_SOURCE_TYPE='cd'
+var_PKG_FILE=/home/arch/fifa/package-list
var_FILE_URL="file:///src/core/pkg"
var_MIRRORLIST="/etc/pacman.d/mirrorlist"
@@ -52,7 +53,7 @@ worker_prepare_disks ()
}
-# Put the list of packages to be installed in /home/arch/fifa/package-list
+# Put the list of packages to be installed in $var_PKG_FILE
worker_package_list ()
{
#TODO: sensible list of packages
@@ -63,6 +64,9 @@ worker_package_list ()
worker_install_packages ()
{
target_special_fs on
+ [ ! -f $var_PKG_FILE ] && die_error "No package file available!"
+ PKGLIST=`cat $var_PKG_FILE`
+ #TODO: what if $var_PKG_FILE is empty? we should die_error because that's probably not what the user wants.. or can it? will pacman complain?
$PACMAN_TARGET -Sy $PKGLIST || die_error "Package installation FAILED."
target_special_fs off
}