setup: Update bash environment files due to UsrMove.

/sbin is removed from PATH.

diff --git a/setup/profile b/setup/profile
index 2d66685588f07b8aeacf77624beb1909532c159a..cc638788aff995adf665048780637e7db35e1ead 100644 (file)
--- a/setup/profile
+++ b/setup/profile
@@ -35,16 +35,14 @@ fi
 
 # Path manipulation
 if [ "$EUID" = "0" ]; then
-    pathmunge /sbin
     pathmunge /usr/sbin
     pathmunge /usr/local/sbin
 else
     pathmunge /usr/local/sbin after
     pathmunge /usr/sbin after
-    pathmunge /sbin after
 fi
 
-HOSTNAME=`/bin/hostname 2>/dev/null`
+HOSTNAME=`/usr/bin/hostname 2>/dev/null`
 HISTSIZE=1000
 if [ "$HISTCONTROL" = "ignorespace" ] ; then
     export HISTCONTROL=ignoreboth

diff --git a/setup/setup.nm b/setup/setup.nm
index 891af408f8d373bd406b18f3017585500c831bab..0eb5c9911d0a6c646b15430d6d4342e656770fca 100644 (file)
--- a/setup/setup.nm
+++ b/setup/setup.nm
@@ -5,7 +5,7 @@
 
 name       = setup
 version    = 3.0
-release    = 4
+release    = 5
 arch       = noarch
 
 groups     = Base Build System/Base
@@ -50,6 +50,10 @@ packages
        package %{name}
                requires = iana-etc
 
+               conflicts
+                       filesystem < 002
+               end
+
                configfiles
                        /etc/aliases
                        /etc/exports