summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2013-07-05 12:27:41 +0200
committerSimon Rettberg2013-07-05 12:27:41 +0200
commitb50458a10a02949332223c67eeae2b18c0ba509f (patch)
tree9ad0103cce2e6e2badb314a1396a0a96a506326a
parent[pam] Cleanup, formatting, force nscd usage in nsswitch.conf, set timeouts fo... (diff)
downloadtm-scripts-b50458a10a02949332223c67eeae2b18c0ba509f.tar.gz
tm-scripts-b50458a10a02949332223c67eeae2b18c0ba509f.tar.xz
tm-scripts-b50458a10a02949332223c67eeae2b18c0ba509f.zip
[rootfs-stage32] Add swapon command for found swap partition, fixes #458
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk2
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/bin/penv (renamed from remote/rootfs/rootfs-stage32/data/usr/sbin/penv)0
2 files changed, 1 insertions, 1 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk
index 06528171..978b341b 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk
@@ -14,7 +14,6 @@
#############################################################################
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin"
# General formatter for the /tmp partition on a local harddisk
diskfm () {
@@ -58,6 +57,7 @@ fdisk -l | sed -n "/^\/dev\//p" > "/etc/disk.partition"
# Check for standard swap partitions and make them available to the system
for hdpartnr in $(sed -n -e "/ 82 /p" "/etc/disk.partition" | sed -e "s/[[:space:]].*//"); do
echo -e "$hdpartnr\tswap\t\tswap\t\tdefaults\t 0 0" >> "/etc/fstab"
+ swapon "$hdpartnr"
done
# We use special non assigned partition type (id44) for harddisk scratch
diff --git a/remote/rootfs/rootfs-stage32/data/usr/sbin/penv b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/penv
index ca5a23ac..ca5a23ac 100755
--- a/remote/rootfs/rootfs-stage32/data/usr/sbin/penv
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/penv