summaryrefslogtreecommitdiff
path: root/unofficial/modules
diff options
context:
space:
mode:
Diffstat (limited to 'unofficial/modules')
-rw-r--r--unofficial/modules/dieter/procedures/automatic8
1 files changed, 5 insertions, 3 deletions
diff --git a/unofficial/modules/dieter/procedures/automatic b/unofficial/modules/dieter/procedures/automatic
index de58fd1..a2b112e 100644
--- a/unofficial/modules/dieter/procedures/automatic
+++ b/unofficial/modules/dieter/procedures/automatic
@@ -66,8 +66,9 @@ worker_prepare_disks ()
dd if=/dev/urandom of=/dev/sda bs=512 count=1
#TODO: integrate this stuff into the functions in the libs + do error checking and handling
+ #NOTE: i don't think i should quote to prevent globbing, but it does seem to help i think (hard to check as resource is busy and you can't reload kernel partition tables)
sfdisk /dev/sda 2>&1 | grep -v 'not have an msdos signature' << EOF
-,10,L,*
+,10,L,'*'
,,L
EOF
[ $? -gt 0 ] && die_error "Could not sfdisk /dev/sda. Return code is $?"
@@ -94,8 +95,9 @@ EOF
worker_package_list ()
{
$SVN export $SVN_BASE/ddm-configs/$TARGET_HOST/trunk/package-list $var_PKG_FILE || die_error "Could not export package list!"
- TARGET_PACKAGES=`cat $var_PKG_FILE` # beware, there are newlines in it now
- TARGET_PACKAGES=`echo $TARGET_PACKAGES` # not anymore :)
+ # cat -> there are newlines in it -> var=`echo $var` -> not anymore :)
+ TARGET_PACKAGES=`cat $var_PKG_FILE` && TARGET_PACKAGES=`echo $TARGET_PACKAGES` || die_error "Could not cat package list. THIS SHOULD NEVER HAPPEN."
+ true
}