diff options
| author | Dirk von Suchodoletz | 2011-05-25 23:10:34 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-05-25 23:10:34 +0200 |
| commit | 511b06adea7af215e9385a1a5f215b9e0d749c0d (patch) | |
| tree | fd8c4099fb2615a7ccc36ee82461f6dd9e45c51f /src | |
| parent | Shell does not accept "!" and "-a" in test ... (diff) | |
| download | core-511b06adea7af215e9385a1a5f215b9e0d749c0d.tar.gz core-511b06adea7af215e9385a1a5f215b9e0d749c0d.tar.xz core-511b06adea7af215e9385a1a5f215b9e0d749c0d.zip | |
Small changes/fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/initramfs/distro-specs/suse/functions-11.4 | 9 | ||||
| -rwxr-xr-x | src/initramfs/scripts/init | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/initramfs/distro-specs/suse/functions-11.4 b/src/initramfs/distro-specs/suse/functions-11.4 index 6699652d..94269cc8 100644 --- a/src/initramfs/distro-specs/suse/functions-11.4 +++ b/src/initramfs/distro-specs/suse/functions-11.4 @@ -49,12 +49,6 @@ if [ "x$start_dreshal" = "xyes" ]; then "/var/run/dbus/at_console/pool"; do testmkd /mnt${dir} done - # enable access to removable devices - sed -i /mnt/etc/PolicyKit/PolicyKit.conf \ - -e "s/\(<\/config>\)/ @@new@@\n\1/" \ - -e "s/@@new@@/<match action=\"@@action@@\">\n@@return@@\n <\/match>/" \ - -e "s/@@action@@/org.freedesktop.hal.storage.mount-removable/" \ - -e "s/@@return@@/ <return result=\"yes\"\/>/" if [ -f /mnt/etc/init.d/dbus ] ; then strinfile "messagebus:" /mnt/etc/passwd || \ @@ -105,8 +99,9 @@ if [ -e /mnt/etc/init.d/ntp ] ; then fi testmkd /mnt/var/lib/ntp/var/run/ntp testmkd /mnt/var/db + touch /mnt/var/db/ntp-kod if [ "x$start_ntp" = "xyes" ] ; then - rllinker "ntp" 7 14 + rllinker "ntp" 2 14 fi fi } diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init index 8a356a75..80732f1a 100755 --- a/src/initramfs/scripts/init +++ b/src/initramfs/scripts/init @@ -783,7 +783,7 @@ if [ "x${union_type}" != "x" ] ; then elif [ "$union_type" == "Fuse" ]; then unionfs -o cow,max_files=32768,allow_other,use_ino,suid,dev \ -o nonempty,chroot=/mnt \ - ${rwdir}/uniontmp=RW:/rorootfs=${nfsro}=RO /mnt + /${rwdir}/uniontmp=RW:/rorootfs=${nfsro}=RO /mnt fi mkdir -p /mnt/uniontmp mount -n --move ${rwdir}/uniontmp /mnt/uniontmp |