diff options
| author | Simon Rettberg | 2013-05-06 11:40:40 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-05-06 11:40:40 +0200 |
| commit | 5b2fefd682a1eaa4cfc7e6b44a1c846684c180ab (patch) | |
| tree | 6ae1224ab397e0cf086063dfd2a6d4e832476a8e /remote | |
| parent | rsyslog fix (diff) | |
| download | tm-scripts-5b2fefd682a1eaa4cfc7e6b44a1c846684c180ab.tar.gz tm-scripts-5b2fefd682a1eaa4cfc7e6b44a1c846684c180ab.tar.xz tm-scripts-5b2fefd682a1eaa4cfc7e6b44a1c846684c180ab.zip | |
Make mounting squashfs smarter; fix module loading logging
Fixes to rsyslogd module buildscript
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/rsyslogd/rsyslogd.build | 7 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build index 14e6de8b..c35d07b7 100644 --- a/remote/modules/rsyslogd/rsyslogd.build +++ b/remote/modules/rsyslogd/rsyslogd.build @@ -26,8 +26,9 @@ post_copy() { sed -i 's/^Before=udev/#&/' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service # activate the service - ln -s rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/syslog.service + ln -sf rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/syslog.service [ ! -d "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants ] && mkdir -p "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants - ln -s ../syslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants/syslog.service - + ln -sf ../syslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants/syslog.service + # TODO: more checks + sed -i.bak '/^After\=var-run.mount/d;/^Requires\=var-run.mount/d;/^Before\=syslog.target/d' "$TARGET_BUILD_DIR/etc/systemd/system/rsyslog.service" } diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 1e41012e..db3f4be7 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -29,8 +29,8 @@ echo "/sbin/mdev" > /proc/sys/kernel/hotplug for DRM in /lib/modules/*/kernel/drivers/gpu/drm/*.ko /lib/modules/*/kernel/drivers/gpu/drm/*/*.ko; do DRM="$(basename "$DRM")" DRM="${DRM%.ko}" - echo "Trying to load module $DRM" - modprobe "$DRM" + echo "Trying to load module $DRM" >> /mnt/modprobing + modprobe "$DRM" > /mnt/modprobing 2>> /mnt/modprobing done # read kernel command line for debugging switch @@ -111,7 +111,7 @@ if [ -n "$nfs" ] ; then mount -t nfs -o ro,async,nolock ${nfsserver}:${nfspath} /rorootfs || { echo "Problem mounting NFS-Directory from ${nfsserver}:${nfspath}. Dropping to DEBUG shell."; DEBUG=1; } else echo "Mounting stage 3.2 as SquashFS" - mount -t squashfs /mnt/$(ls /mnt) /rorootfs || { echo "Problem mounting Squashfs. Dropping to DEBUG shell."; DEBUG=1; } + mount -t squashfs /mnt/$(ls /mnt/*.sqfs) /rorootfs || { echo "Problem mounting Squashfs. Dropping to DEBUG shell."; DEBUG=1; } fi if [ $DEBUG -ge 1 ]; then |