move stuff directly to /usr (#905492)

3 files changed, 59 insertions, 59 deletions

diff --git a/Makefile b/Makefile
index ea16f2b8..9ac75018 100644
--- a/Makefile
+++ b/Makefile
@@ -13,16 +13,16 @@ all:
 	make -C po
 
 install:
-	mkdir -p $(ROOT)/etc/profile.d $(ROOT)/sbin $(ROOT)/usr/sbin
+	mkdir -p $(ROOT)/etc/profile.d $(ROOT)/usr/sbin
 	mkdir -p $(ROOT)$(mandir)/man{5,8}
 	mkdir -p $(ROOT)/etc/rwtab.d $(ROOT)/etc/statetab.d
 	mkdir -p $(ROOT)/var/lib/stateless/writable
 	mkdir -p $(ROOT)/var/lib/stateless/state
 
 	install -m644  adjtime $(ROOT)/etc
-	install -m644 inittab $(ROOT)/etc
+	install -m644  inittab $(ROOT)/etc
 	install -m644  rwtab statetab networks $(ROOT)/etc
-	install -m755  service $(ROOT)/sbin
+	install -m755  service $(ROOT)/usr/sbin
 	install -m644  lang.csh lang.sh $(ROOT)/etc/profile.d
 	install -m644  256term.csh 256term.sh $(ROOT)/etc/profile.d
 	install -m644  debug.csh debug.sh $(ROOT)/etc/profile.d
@@ -41,11 +41,11 @@ install:
 	install -m644 sysconfig/debug sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
 	cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
 	cp -af ppp NetworkManager $(ROOT)/etc
-	mkdir -p $(ROOT)/lib/systemd/
-	cp -af systemd/* $(ROOT)/lib/systemd/
+	mkdir -p $(ROOT)/usr/lib/systemd/
+	cp -af systemd/* $(ROOT)/usr/lib/systemd/
 	mkdir -p $(ROOT)/etc/ppp/peers
-	mkdir -p $(ROOT)/lib
-	cp -af udev $(ROOT)/lib
+	mkdir -p $(ROOT)/usr/lib
+	cp -af udev $(ROOT)/usr/lib
 	chmod 755 $(ROOT)/etc/rc.d/* $(ROOT)/etc/rc.d/init.d/*
 	chmod 644 $(ROOT)/etc/rc.d/init.d/functions
 	chmod 755 $(ROOT)/etc/ppp/peers
@@ -60,13 +60,13 @@ install:
 	  install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \
 	fi
 
-	mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/sbin
-	mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/sbin
+	mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/usr/sbin
+	mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/usr/sbin
 	(cd $(ROOT)/etc/sysconfig/network-scripts; \
 	  ln -sf ifup-ippp ifup-isdn ; \
 	  ln -sf ifdown-ippp ifdown-isdn ; \
-	  ln -sf ../../../sbin/ifup . ; \
-	  ln -sf ../../../sbin/ifdown . )
+	  ln -sf ../../../usr/sbin/ifup . ; \
+	  ln -sf ../../../usr/sbin/ifdown . )
 	make install ROOT=$(ROOT) mandir=$(mandir) -C src
 	make install PREFIX=$(ROOT) -C po
 
@@ -84,21 +84,21 @@ install:
 	done
 
 # Can't store symlinks in a CVS archive
-	mkdir -p -m 755 $(ROOT)/lib/systemd/system/multi-user.target.wants
-	mkdir -p -m 755 $(ROOT)/lib/systemd/system/graphical.target.wants
-	ln -s reboot.target $(ROOT)/lib/systemd/system/ctrl-alt-del.target
-	mkdir -p -m 755 $(ROOT)/lib/systemd/system/local-fs.target.wants
-	mkdir -p -m 755 $(ROOT)/lib/systemd/system/basic.target.wants
-	mkdir -p -m 755 $(ROOT)/lib/systemd/system/sysinit.target.wants
-	ln -s ../fedora-configure.service $(ROOT)/lib/systemd/system/basic.target.wants
-	ln -s ../fedora-loadmodules.service $(ROOT)/lib/systemd/system/basic.target.wants
-	ln -s ../fedora-autorelabel.service $(ROOT)/lib/systemd/system/basic.target.wants
-	ln -s ../fedora-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants
-	ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants
-	ln -s ../fedora-import-state.service $(ROOT)/lib/systemd/system/local-fs.target.wants
-
-	mkdir -p $(ROOT)/lib/tmpfiles.d
-	install -m 644 initscripts.tmpfiles.d $(ROOT)/lib/tmpfiles.d/initscripts.conf
+	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/multi-user.target.wants
+	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/graphical.target.wants
+	ln -s reboot.target $(ROOT)/usr/lib/systemd/system/ctrl-alt-del.target
+	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
+	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/basic.target.wants
+	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/sysinit.target.wants
+	ln -s ../fedora-configure.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+	ln -s ../fedora-loadmodules.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+	ln -s ../fedora-autorelabel.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+	ln -s ../fedora-autorelabel-mark.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+	ln -s ../fedora-readonly.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
+	ln -s ../fedora-import-state.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
+
+	mkdir -p $(ROOT)/usr/lib/tmpfiles.d
+	install -m 644 initscripts.tmpfiles.d $(ROOT)/usr/lib/tmpfiles.d/initscripts.conf
 
 # These are LSB compatibility symlinks.  At some point in the future
 # the actual files will be here instead of symlinks
diff --git a/initscripts.spec b/initscripts.spec
index d5645c9a..fa8d9079 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -86,26 +86,26 @@ chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp
 chmod 664 /var/log/wtmp /var/run/utmp
 chmod 600 /var/log/btmp
 
-/sbin/chkconfig --add network
-/sbin/chkconfig --add netconsole
+/usr/sbin/chkconfig --add network
+/usr/sbin/chkconfig --add netconsole
 if [ $1 -eq 1 ]; then
-        /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+        /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || :
 fi
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/chkconfig --del network
-  /sbin/chkconfig --del netconsole
+  /usr/sbin/chkconfig --del network
+  /usr/sbin/chkconfig --del netconsole
 fi
 
 %triggerun -- initscripts < 7.62
-/sbin/chkconfig --del random
-/sbin/chkconfig --del rawdevices
+/usr/sbin/chkconfig --del random
+/usr/sbin/chkconfig --del rawdevices
 exit 0
 
 %postun
 if [ $1 -ge 1 ]; then
-  /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+  /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || :
 fi
 
 %clean
@@ -119,10 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/sysconfig/netconsole
 %config(noreplace) /etc/sysconfig/readonly-root
 /etc/sysconfig/network-scripts/ifdown
-/sbin/ifdown
+/usr/sbin/ifdown
 /etc/sysconfig/network-scripts/ifdown-post
 /etc/sysconfig/network-scripts/ifup
-/sbin/ifup
+/usr/sbin/ifup
 %dir /etc/sysconfig/console
 %dir /etc/sysconfig/modules
 /etc/sysconfig/network-scripts/network-functions
@@ -161,8 +161,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rwtab.d
 /etc/statetab
 %dir /etc/statetab.d
-/lib/systemd/fedora-*
-/lib/systemd/system/*
+/usr/lib/systemd/fedora-*
+/usr/lib/systemd/system/*
 %config(noreplace) /etc/inittab
 %dir /etc/rc.d
 %dir /etc/rc.d/rc[0-9].d
@@ -175,17 +175,17 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /etc/profile.d/debug*
 /etc/profile.d/*
 /usr/sbin/sys-unconfig
-/bin/ipcalc
-/bin/usleep
+/usr/bin/ipcalc
+/usr/bin/usleep
 %attr(4755,root,root) /usr/sbin/usernetctl
-/sbin/consoletype
-/sbin/genhostid
-/sbin/sushell
-%attr(2755,root,root) /sbin/netreport
-/lib/udev/rules.d/*
-/lib/udev/rename_device
-/sbin/service
-/sbin/ppp-watch
+/usr/sbin/consoletype
+/usr/sbin/genhostid
+/usr/sbin/sushell
+%attr(2755,root,root) /usr/sbin/netreport
+/usr/lib/udev/rules.d/*
+/usr/lib/udev/rename_device
+/usr/sbin/service
+/usr/sbin/ppp-watch
 %{_mandir}/man*/*
 %dir %attr(775,root,root) /var/run/netreport
 %dir /etc/ppp
@@ -205,8 +205,8 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
-%dir /lib/tmpfiles.d
-/lib/tmpfiles.d/initscripts.conf
+%dir /usr/lib/tmpfiles.d
+/usr/lib/tmpfiles.d/initscripts.conf
 %dir /usr/libexec/initscripts
 %dir /usr/libexec/initscripts/legacy-actions
 
diff --git a/src/Makefile b/src/Makefile
index 45447739..05b1379a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,16 +18,16 @@ clean:
 	rm -f $(PROGS) *.o *~
 
 install:
-	mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/lib/udev
-	install -m 755 usleep $(ROOT)/bin/usleep
+	mkdir -p $(ROOT)/usr/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/usr/lib/udev
+	install -m 755 usleep $(ROOT)/usr/bin/usleep
 	install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl
-	install -m 2755 netreport $(ROOT)/sbin/netreport
-	install -m 755 ipcalc $(ROOT)/bin/ipcalc
-	install -m 755 genhostid $(ROOT)/sbin/genhostid
-	install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch
-	install -m 755 consoletype $(ROOT)/sbin/consoletype
-	install -m 755 sushell $(ROOT)/sbin/sushell
-	install -m 755 rename_device $(ROOT)/lib/udev/rename_device
+	install -m 2755 netreport $(ROOT)/usr/sbin/netreport
+	install -m 755 ipcalc $(ROOT)/usr/bin/ipcalc
+	install -m 755 genhostid $(ROOT)/usr/sbin/genhostid
+	install -m 755 ppp-watch $(ROOT)/usr/sbin/ppp-watch
+	install -m 755 consoletype $(ROOT)/usr/sbin/consoletype
+	install -m 755 sushell $(ROOT)/usr/sbin/sushell
+	install -m 755 rename_device $(ROOT)/usr/lib/udev/rename_device
 	install -m 644 genhostid.1 $(ROOT)$(mandir)/man1
 	install -m 644 netreport.1 $(ROOT)$(mandir)/man1
 	install -m 644 usleep.1 $(ROOT)$(mandir)/man1