summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdebian/vyatta-cfg-system.postinst.in4
-rwxr-xr-xscripts/install/install-image-existing5
2 files changed, 4 insertions, 5 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 735b49ff..fde99041 100755
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -13,7 +13,7 @@ do
update-rc.d -f ${init} remove >/dev/null
done
-# remove extra call to clock setup only need one. this speeds up boot
+# remove extra call to clock setup only need one. this speeds up boot
# Mystery: why does Debian do it twice?
if [ -L /etc/rcS.d/S*hwclockfirst.sh -a -L /etc/rcS.d/S*hwclock.sh ]; then
rm /etc/rcS.d/S*hwclock.sh
@@ -89,7 +89,7 @@ if [ "$sysconfdir" != "/etc" ]; then
# Set file capabilities
sed -r -e '/^#/d' -e '/^[[:blank:]]*$/d' < $sysconfdir/filecaps | \
- while read capability path; do
+ while read capability path; do
touch -c $path
setcap $capability $path
done
diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing
index ac020c96..52d129f0 100755
--- a/scripts/install/install-image-existing
+++ b/scripts/install/install-image-existing
@@ -27,7 +27,7 @@ get_grub_index () {
is_kvm=`echo $cur_line | grep KVM`
is_serial=`echo $cur_line | grep Serial`
-
+
# index 0 is KVM, 1 is Serial
if [ -n "$is_serial" ]; then
echo 1
@@ -145,7 +145,7 @@ if [ ! -f "$squash_img" ] || [ -z "$boot_files" ]; then
becho 'Cannot find the files. Exiting...'
exit 1
fi
-target_squash=$REL_ROOT/$NEWVER.squashfs
+target_squash=$REL_ROOT/$NEWVER.squashfs
cp -p $squash_img $target_squash >&/dev/null
cp --no-dereference --preserve=all $boot_files $REL_ROOT/ >&/dev/null
@@ -271,4 +271,3 @@ echo 'Done.'
# done
exit 0
-