diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-01-17 12:50:03 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-01-17 12:50:03 +0000 |
| commit | f2e42b2d3387da1e0b67d99ddf9e4acf39d55729 (patch) | |
| tree | 6df54c09a0bae0ea1b4e17c1aafe26bee602afa9 /smf-base | |
| parent | c594504164a54923acf871e178c7f066ec83fddb (diff) | |
| download | illumos-packaging-f2e42b2d3387da1e0b67d99ddf9e4acf39d55729.tar.gz | |
smf-base: no libc mounts
Diffstat (limited to 'smf-base')
| -rw-r--r-- | smf-base/debian/patches/series | 1 | ||||
| -rw-r--r-- | smf-base/debian/patches/smf-no-libc_mount.patch | 53 |
2 files changed, 54 insertions, 0 deletions
diff --git a/smf-base/debian/patches/series b/smf-base/debian/patches/series index ed26232..599c771 100644 --- a/smf-base/debian/patches/series +++ b/smf-base/debian/patches/series @@ -1,2 +1,3 @@ smf-hostname.patch smf-no-rcS.patch +smf-no-libc_mount.patch diff --git a/smf-base/debian/patches/smf-no-libc_mount.patch b/smf-base/debian/patches/smf-no-libc_mount.patch new file mode 100644 index 0000000..fbc60ee --- /dev/null +++ b/smf-base/debian/patches/smf-no-libc_mount.patch @@ -0,0 +1,53 @@ +Index: smf-base/usr/src/cmd/svc/milestone/fs-root +=================================================================== +--- smf-base.orig/usr/src/cmd/svc/milestone/fs-root 2012-10-08 00:25:33.000000000 +0000 ++++ smf-base/usr/src/cmd/svc/milestone/fs-root 2013-01-17 12:49:32.112263420 +0000 +@@ -23,33 +23,6 @@ + # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. + # + +-# Make sure that the libraries essential to this stage of booting can be found. +-LD_LIBRARY_PATH=/lib; export LD_LIBRARY_PATH +- +-libc_mount() { +- # +- # If there is an optimized libc available in /usr that fits this +- # processor, mount it on top of the base libc. +- # +- LIBC_MOE_32=`/usr/bin/moe -32 '/usr/lib/libc/$HWCAP'` +- if [ -n "$LIBC_MOE_32" ]; then +- /usr/sbin/mount | egrep -s "^/lib/libc.so.1 on " +- if [ $? -ne 0 ]; then +- /usr/sbin/mount -O -F lofs $LIBC_MOE_32 /lib/libc.so.1 +- fi +- fi +- +- ARCH64=`isainfo | awk '{print $1}'` +- LIBC_MOE_64=`/usr/bin/moe -64 /usr/lib/$ARCH64/libc/'$HWCAP'` +- if [ -n "$LIBC_MOE_64" ]; then +- /usr/sbin/mount | egrep -s "^/lib/$ARCH64/libc.so.1 on " +- if [ $? -ne 0 ]; then +- /usr/sbin/mount -O -F lofs $LIBC_MOE_64 \ +- /lib/$ARCH64/libc.so.1 +- fi +- fi +-} +- + . /lib/svc/share/smf_include.sh + . /lib/svc/share/fs_include.sh + +@@ -59,7 +32,6 @@ + # it needs to currently exist for all zones. + # + if smf_is_nonglobalzone; then +- libc_mount + exit $SMF_EXIT_OK + fi + +@@ -182,6 +154,4 @@ + # + /usr/sbin/devfsadm -I -P + +-libc_mount +- + exit $SMF_EXIT_OK |