summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-12-09 19:40:59 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-12-09 19:40:59 +0100
commit2d414a8b2adcf23215500cbe73b88c21bdc14dbb (patch)
treef8d8337ba884f2254fbf83b0eb758de8185fb5a7 /src/core
parente85161045759c0931329900b062c1f64ceedfc85 (diff)
hang bug in manual FS stuff + some small stuff
Diffstat (limited to 'src/core')
-rw-r--r--src/core/libs/lib-blockdevices-filesystems.sh6
-rw-r--r--src/core/libs/lib-ui-interactive.sh6
2 files changed, 7 insertions, 5 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh
index 980c196..2934660 100644
--- a/src/core/libs/lib-blockdevices-filesystems.sh
+++ b/src/core/libs/lib-blockdevices-filesystems.sh
@@ -55,7 +55,7 @@ target_special_fs ()
}
-# taken from setup
+# taken from setup #TODO: we should be able to not need this function
# Disable swap and all mounted partitions for the destination system. Unmount
# the destination root partition last! TODO: only taking care of / is not enough, we can have the same problem on another level (eg /a/b/c and /a/b)
target_umountall()
@@ -284,6 +284,8 @@ partition()
target_umountall
# setup input var for sfdisk
+ # format: each line=1 part. <start> <size> <id> <bootable>[ <c,h,s> <c,h,s>]
+
for fsspec in $STRING; do
fssize=$(echo $fsspec | tr -d ' ' | cut -f1 -d:)
fssize_spec=",$fssize"
@@ -300,7 +302,7 @@ partition()
sfdisk_input="${sfdisk_input}${fssize_spec}${fstype_spec}${bootflag_spec}\n"
done
- sfdisk_input=$(printf "$sfdisk_input")
+ sfdisk_input=$(printf "$sfdisk_input") # convert \n to newlines
# invoke sfdisk
debug "Partition calls: sfdisk $DEVICE -uM >$LOG 2>&1 <<< $sfdisk_input"
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index c381837..c2c7300 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -475,9 +475,9 @@ interactive_filesystems() {
errors=
warnings=
- grep -q ';/boot;' || warnings="$warnings\n-No separate /boot filesystem"
- grep -q ';/;' || errors="$errors\n-No filesystem with mountpoint /"
- grep -q ' swap;' || grep -q '|swap;' || warnings="$warnings\n-No swap partition defined"
+ grep -q ';/boot;' $TMP_BLOCKDEVICES || warnings="$warnings\n-No separate /boot filesystem"
+ grep -q ';/;' $TMP_BLOCKDEVICES || errors="$errors\n-No filesystem with mountpoint /"
+ grep -q ' swap;' $TMP_BLOCKDEVICES || grep -q '|swap;' $TMP_BLOCKDEVICES || warnings="$warnings\n-No swap partition defined"
if [ -n "$errors$warnings" ]
then