diff options
| author | Jonathan Bauer | 2013-04-03 15:39:20 +0200 |
|---|---|---|
| committer | sr | 2013-04-12 19:11:40 +0200 |
| commit | 9ee2ccd9d85c865954bf52e2013ab57d8c2f0374 (patch) | |
| tree | 6cd743a8ad082d5456c2660ff989041e51b7de35 | |
| parent | Size calculation fixed (diff) | |
| download | tm-scripts-9ee2ccd9d85c865954bf52e2013ab57d8c2f0374.tar.gz tm-scripts-9ee2ccd9d85c865954bf52e2013ab57d8c2f0374.tar.xz tm-scripts-9ee2ccd9d85c865954bf52e2013ab57d8c2f0374.zip | |
fixes for disk scripts
| -rwxr-xr-x[-rw-r--r--] | data/analyse-disk.sh | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | data/disk-tmp.sh | 5 | ||||
| -rw-r--r-- | data/printk.service | 6 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage31/rootfs-stage31.conf | 3 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 4 |
5 files changed, 15 insertions, 12 deletions
diff --git a/data/analyse-disk.sh b/data/analyse-disk.sh index a7145427..27c3f306 100644..100755 --- a/data/analyse-disk.sh +++ b/data/analyse-disk.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (c) 2013 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. @@ -27,7 +27,7 @@ for fs in xfs ext3 ext2 ; do esac if [ -n ${available} ]; then unset found - for path in /sbin /bin /usr/sbin /usr/bin ; do + for path in /sbin /bin /usr/sbin /usr/bin /openslx/sbin /openslx/bin; do if test -x /$path/mkfs.$fs ; then found=yes case mkfs.$fs in @@ -49,8 +49,7 @@ for fs in xfs ext3 ext2 ; do mount -t ${fs} ${target} /run/mount/tmp fi done - [ -z $found ] && continue - else break + [ -n "$found" ] && break fi done } @@ -74,7 +73,7 @@ for hdpartnr in $(cat /etc/disk.partition | \ # echo "$hdpartnr is mounted to /mnt/tmp at $(sysup)" >/tmp/tmpready echo -e "$hdpartnr\t/tmp\t\tnoauto\t\tdefaults\t 0 0" >>/etc/fstab else - echo "formatting failed for some reason ($(sysup))" >/tmp/tmpready + echo "formatting failed for some reason " >/tmp/tmpready fi ) & break done diff --git a/data/disk-tmp.sh b/data/disk-tmp.sh index 842d8230..4378c45c 100644..100755 --- a/data/disk-tmp.sh +++ b/data/disk-tmp.sh @@ -14,10 +14,11 @@ ############################################################################# # Check if ID44 is available by analysing /etc/fstab for appropriate entry -if grep -qe "/dev/.*/tmp" /etc/fstab 2>/dev/null ; then +if cat /proc/mounts | grep -qe "/dev/.*/tmp" ; then mkdir -p /run/tmp mv /tmp/* /run/tmp - mount --move /run/mount/tmp /tmp + mount --bind /run/mount/tmp /tmp + umount /run/mount/tmp mv /run/tmp/* /tmp rmdir /run/tmp fi diff --git a/data/printk.service b/data/printk.service new file mode 100644 index 00000000..97fe8055 --- /dev/null +++ b/data/printk.service @@ -0,0 +1,6 @@ +[Unit] +Description=shuts up kernel + +[Service] +Type=simple +ExecStart=/openslx/bin/echo "0" > /proc/sys/kernel/printk diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf index bb365d5f..6d4af2c9 100644 --- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf +++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf @@ -1,9 +1,6 @@ REQUIRED_MODULES=" busybox" -#REQUIRED_DEPENDENCIES=" v86d" -#REQUIRED_BINARIES=" v86d" REQUIRED_KERNEL_MODULES=" kernel/drivers/video/sis/sisfb.ko kernel/drivers/video/via/viafb.ko - kernel/drivers/video/uvesafb.ko kernel/drivers/acpi/video.ko kernel/drivers/ssb/ssb.ko kernel/drivers/gpu/drm/ttm/ttm.ko diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index 7900ec5c..103f5df8 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -1,6 +1,5 @@ REQUIRED_DEPENDENCIES="nfs-common aufs-tools squashfs-tools whois" -REQUIRED_BINARIES=" sh - bash +REQUIRED_BINARIES=" bash more less agetty @@ -16,6 +15,7 @@ REQUIRED_BINARIES=" sh umount.nfs4 mount.aufs fdisk + mkfs.xfs rm blkid modprobe |