From 63a3efe8bb87799c3ffb6804eb5bc2f3efbb4c2b Mon Sep 17 00:00:00 2001 From: Samveen Gulati Date: Wed, 10 Jan 2018 09:23:43 +0000 Subject: [PATCH] move `/*bin` to `/usr/` to fix path conflict of genesis `base` and `scripts` RH7/Centos7 and recent versions of fedora relocate `/*bin/*` into `/usr/*bin/`. This causes conflicts for upgrades against xCAT-genesis-scripts-* packages which expect the `/bin` a to be a directory while `xCAT-genesis-base-*` packages provide a link. Relocating all files into `/usr` fixes that conflict and allows a clean upgrade from all old versions. --- xCAT-genesis-scripts/debian/rules | 4 +- .../{ => usr}/bin/allowcred.awk | 0 xCAT-genesis-scripts/{ => usr}/bin/bmcsetup | 0 xCAT-genesis-scripts/{ => usr}/bin/configraid | 0 .../{ => usr}/bin/diskdiscover | 0 .../{ => usr}/bin/dodiscovery | 0 xCAT-genesis-scripts/{ => usr}/bin/dosysclone | 0 xCAT-genesis-scripts/{ => usr}/bin/doxcat | 0 xCAT-genesis-scripts/{ => usr}/bin/getadapter | 0 xCAT-genesis-scripts/{ => usr}/bin/getcert | 0 xCAT-genesis-scripts/{ => usr}/bin/getdestiny | 0 xCAT-genesis-scripts/{ => usr}/bin/getipmi | 0 xCAT-genesis-scripts/{ => usr}/bin/ifup | 0 .../{ => usr}/bin/minixcatd.awk | 0 .../{ => usr}/bin/nextdestiny | 0 .../{ => usr}/bin/pseries_platform | 0 xCAT-genesis-scripts/{ => usr}/bin/raidcmd | 0 xCAT-genesis-scripts/{ => usr}/bin/raidutils | 0 .../{ => usr}/bin/remoteimmsetup | 0 xCAT-genesis-scripts/{ => usr}/bin/restart | 0 xCAT-genesis-scripts/{ => usr}/bin/udpcat.awk | 0 .../{ => usr}/bin/update_flash | 0 .../{ => usr}/bin/update_flash_nv | 0 .../{ => usr}/bin/updateflag.awk | 0 .../{ => usr}/sbin/loadmlxeth | 0 .../{ => usr}/sbin/setupimmnic | 0 .../xCAT-genesis-scripts.spec | 50 +++++++++---------- 27 files changed, 27 insertions(+), 27 deletions(-) rename xCAT-genesis-scripts/{ => usr}/bin/allowcred.awk (100%) rename xCAT-genesis-scripts/{ => usr}/bin/bmcsetup (100%) rename xCAT-genesis-scripts/{ => usr}/bin/configraid (100%) rename xCAT-genesis-scripts/{ => usr}/bin/diskdiscover (100%) rename xCAT-genesis-scripts/{ => usr}/bin/dodiscovery (100%) rename xCAT-genesis-scripts/{ => usr}/bin/dosysclone (100%) rename xCAT-genesis-scripts/{ => usr}/bin/doxcat (100%) rename xCAT-genesis-scripts/{ => usr}/bin/getadapter (100%) rename xCAT-genesis-scripts/{ => usr}/bin/getcert (100%) rename xCAT-genesis-scripts/{ => usr}/bin/getdestiny (100%) rename xCAT-genesis-scripts/{ => usr}/bin/getipmi (100%) rename xCAT-genesis-scripts/{ => usr}/bin/ifup (100%) rename xCAT-genesis-scripts/{ => usr}/bin/minixcatd.awk (100%) rename xCAT-genesis-scripts/{ => usr}/bin/nextdestiny (100%) rename xCAT-genesis-scripts/{ => usr}/bin/pseries_platform (100%) rename xCAT-genesis-scripts/{ => usr}/bin/raidcmd (100%) rename xCAT-genesis-scripts/{ => usr}/bin/raidutils (100%) rename xCAT-genesis-scripts/{ => usr}/bin/remoteimmsetup (100%) rename xCAT-genesis-scripts/{ => usr}/bin/restart (100%) rename xCAT-genesis-scripts/{ => usr}/bin/udpcat.awk (100%) rename xCAT-genesis-scripts/{ => usr}/bin/update_flash (100%) rename xCAT-genesis-scripts/{ => usr}/bin/update_flash_nv (100%) rename xCAT-genesis-scripts/{ => usr}/bin/updateflag.awk (100%) rename xCAT-genesis-scripts/{ => usr}/sbin/loadmlxeth (100%) rename xCAT-genesis-scripts/{ => usr}/sbin/setupimmnic (100%) diff --git a/xCAT-genesis-scripts/debian/rules b/xCAT-genesis-scripts/debian/rules index adff007b4..6da840833 100755 --- a/xCAT-genesis-scripts/debian/rules +++ b/xCAT-genesis-scripts/debian/rules @@ -33,8 +33,8 @@ install: dh_installdirs $(installdir) dh_install -X".svn" dh_install ./etc/ $(installtodir) - dh_install ./bin/ $(installtodir) - dh_install ./sbin/ $(installtodir) + dh_install ./usr/bin/ $(installtodir) + dh_install ./usr/sbin/ $(installtodir) dh_compress dh_installdeb dh_gencontrol diff --git a/xCAT-genesis-scripts/bin/allowcred.awk b/xCAT-genesis-scripts/usr/bin/allowcred.awk similarity index 100% rename from xCAT-genesis-scripts/bin/allowcred.awk rename to xCAT-genesis-scripts/usr/bin/allowcred.awk diff --git a/xCAT-genesis-scripts/bin/bmcsetup b/xCAT-genesis-scripts/usr/bin/bmcsetup similarity index 100% rename from xCAT-genesis-scripts/bin/bmcsetup rename to xCAT-genesis-scripts/usr/bin/bmcsetup diff --git a/xCAT-genesis-scripts/bin/configraid b/xCAT-genesis-scripts/usr/bin/configraid similarity index 100% rename from xCAT-genesis-scripts/bin/configraid rename to xCAT-genesis-scripts/usr/bin/configraid diff --git a/xCAT-genesis-scripts/bin/diskdiscover b/xCAT-genesis-scripts/usr/bin/diskdiscover similarity index 100% rename from xCAT-genesis-scripts/bin/diskdiscover rename to xCAT-genesis-scripts/usr/bin/diskdiscover diff --git a/xCAT-genesis-scripts/bin/dodiscovery b/xCAT-genesis-scripts/usr/bin/dodiscovery similarity index 100% rename from xCAT-genesis-scripts/bin/dodiscovery rename to xCAT-genesis-scripts/usr/bin/dodiscovery diff --git a/xCAT-genesis-scripts/bin/dosysclone b/xCAT-genesis-scripts/usr/bin/dosysclone similarity index 100% rename from xCAT-genesis-scripts/bin/dosysclone rename to xCAT-genesis-scripts/usr/bin/dosysclone diff --git a/xCAT-genesis-scripts/bin/doxcat b/xCAT-genesis-scripts/usr/bin/doxcat similarity index 100% rename from xCAT-genesis-scripts/bin/doxcat rename to xCAT-genesis-scripts/usr/bin/doxcat diff --git a/xCAT-genesis-scripts/bin/getadapter b/xCAT-genesis-scripts/usr/bin/getadapter similarity index 100% rename from xCAT-genesis-scripts/bin/getadapter rename to xCAT-genesis-scripts/usr/bin/getadapter diff --git a/xCAT-genesis-scripts/bin/getcert b/xCAT-genesis-scripts/usr/bin/getcert similarity index 100% rename from xCAT-genesis-scripts/bin/getcert rename to xCAT-genesis-scripts/usr/bin/getcert diff --git a/xCAT-genesis-scripts/bin/getdestiny b/xCAT-genesis-scripts/usr/bin/getdestiny similarity index 100% rename from xCAT-genesis-scripts/bin/getdestiny rename to xCAT-genesis-scripts/usr/bin/getdestiny diff --git a/xCAT-genesis-scripts/bin/getipmi b/xCAT-genesis-scripts/usr/bin/getipmi similarity index 100% rename from xCAT-genesis-scripts/bin/getipmi rename to xCAT-genesis-scripts/usr/bin/getipmi diff --git a/xCAT-genesis-scripts/bin/ifup b/xCAT-genesis-scripts/usr/bin/ifup similarity index 100% rename from xCAT-genesis-scripts/bin/ifup rename to xCAT-genesis-scripts/usr/bin/ifup diff --git a/xCAT-genesis-scripts/bin/minixcatd.awk b/xCAT-genesis-scripts/usr/bin/minixcatd.awk similarity index 100% rename from xCAT-genesis-scripts/bin/minixcatd.awk rename to xCAT-genesis-scripts/usr/bin/minixcatd.awk diff --git a/xCAT-genesis-scripts/bin/nextdestiny b/xCAT-genesis-scripts/usr/bin/nextdestiny similarity index 100% rename from xCAT-genesis-scripts/bin/nextdestiny rename to xCAT-genesis-scripts/usr/bin/nextdestiny diff --git a/xCAT-genesis-scripts/bin/pseries_platform b/xCAT-genesis-scripts/usr/bin/pseries_platform similarity index 100% rename from xCAT-genesis-scripts/bin/pseries_platform rename to xCAT-genesis-scripts/usr/bin/pseries_platform diff --git a/xCAT-genesis-scripts/bin/raidcmd b/xCAT-genesis-scripts/usr/bin/raidcmd similarity index 100% rename from xCAT-genesis-scripts/bin/raidcmd rename to xCAT-genesis-scripts/usr/bin/raidcmd diff --git a/xCAT-genesis-scripts/bin/raidutils b/xCAT-genesis-scripts/usr/bin/raidutils similarity index 100% rename from xCAT-genesis-scripts/bin/raidutils rename to xCAT-genesis-scripts/usr/bin/raidutils diff --git a/xCAT-genesis-scripts/bin/remoteimmsetup b/xCAT-genesis-scripts/usr/bin/remoteimmsetup similarity index 100% rename from xCAT-genesis-scripts/bin/remoteimmsetup rename to xCAT-genesis-scripts/usr/bin/remoteimmsetup diff --git a/xCAT-genesis-scripts/bin/restart b/xCAT-genesis-scripts/usr/bin/restart similarity index 100% rename from xCAT-genesis-scripts/bin/restart rename to xCAT-genesis-scripts/usr/bin/restart diff --git a/xCAT-genesis-scripts/bin/udpcat.awk b/xCAT-genesis-scripts/usr/bin/udpcat.awk similarity index 100% rename from xCAT-genesis-scripts/bin/udpcat.awk rename to xCAT-genesis-scripts/usr/bin/udpcat.awk diff --git a/xCAT-genesis-scripts/bin/update_flash b/xCAT-genesis-scripts/usr/bin/update_flash similarity index 100% rename from xCAT-genesis-scripts/bin/update_flash rename to xCAT-genesis-scripts/usr/bin/update_flash diff --git a/xCAT-genesis-scripts/bin/update_flash_nv b/xCAT-genesis-scripts/usr/bin/update_flash_nv similarity index 100% rename from xCAT-genesis-scripts/bin/update_flash_nv rename to xCAT-genesis-scripts/usr/bin/update_flash_nv diff --git a/xCAT-genesis-scripts/bin/updateflag.awk b/xCAT-genesis-scripts/usr/bin/updateflag.awk similarity index 100% rename from xCAT-genesis-scripts/bin/updateflag.awk rename to xCAT-genesis-scripts/usr/bin/updateflag.awk diff --git a/xCAT-genesis-scripts/sbin/loadmlxeth b/xCAT-genesis-scripts/usr/sbin/loadmlxeth similarity index 100% rename from xCAT-genesis-scripts/sbin/loadmlxeth rename to xCAT-genesis-scripts/usr/sbin/loadmlxeth diff --git a/xCAT-genesis-scripts/sbin/setupimmnic b/xCAT-genesis-scripts/usr/sbin/setupimmnic similarity index 100% rename from xCAT-genesis-scripts/sbin/setupimmnic rename to xCAT-genesis-scripts/usr/sbin/setupimmnic diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec index 2a35f23af..4fb917727 100755 --- a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec +++ b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec @@ -71,32 +71,32 @@ touch /etc/xcat/genesis-scripts-updated %Files %defattr(-,root,root) #%dir %attr(-,root,root) %{rpminstallroot} -%{rpminstallroot}/bin/allowcred.awk -%{rpminstallroot}/bin/bmcsetup -%{rpminstallroot}/bin/raidcmd -%{rpminstallroot}/bin/raidutils -%{rpminstallroot}/bin/diskdiscover -%{rpminstallroot}/bin/configraid -%{rpminstallroot}/bin/dodiscovery -%{rpminstallroot}/bin/dosysclone -%{rpminstallroot}/bin/doxcat -%{rpminstallroot}/bin/getadapter -%{rpminstallroot}/bin/getcert -%{rpminstallroot}/bin/getdestiny -%{rpminstallroot}/bin/getipmi -%{rpminstallroot}/bin/ifup -%{rpminstallroot}/bin/minixcatd.awk -%{rpminstallroot}/bin/nextdestiny -%{rpminstallroot}/bin/remoteimmsetup -%{rpminstallroot}/bin/udpcat.awk -%{rpminstallroot}/bin/updateflag.awk -%{rpminstallroot}/bin/pseries_platform -%{rpminstallroot}/bin/update_flash -%{rpminstallroot}/bin/update_flash_nv -%{rpminstallroot}/bin/restart +%{rpminstallroot}/usr/bin/allowcred.awk +%{rpminstallroot}/usr/bin/bmcsetup +%{rpminstallroot}/usr/bin/raidcmd +%{rpminstallroot}/usr/bin/raidutils +%{rpminstallroot}/usr/bin/diskdiscover +%{rpminstallroot}/usr/bin/configraid +%{rpminstallroot}/usr/bin/dodiscovery +%{rpminstallroot}/usr/bin/dosysclone +%{rpminstallroot}/usr/bin/doxcat +%{rpminstallroot}/usr/bin/getadapter +%{rpminstallroot}/usr/bin/getcert +%{rpminstallroot}/usr/bin/getdestiny +%{rpminstallroot}/usr/bin/getipmi +%{rpminstallroot}/usr/bin/ifup +%{rpminstallroot}/usr/bin/minixcatd.awk +%{rpminstallroot}/usr/bin/nextdestiny +%{rpminstallroot}/usr/bin/remoteimmsetup +%{rpminstallroot}/usr/bin/udpcat.awk +%{rpminstallroot}/usr/bin/updateflag.awk +%{rpminstallroot}/usr/bin/pseries_platform +%{rpminstallroot}/usr/bin/update_flash +%{rpminstallroot}/usr/bin/update_flash_nv +%{rpminstallroot}/usr/bin/restart %{rpminstallroot}/etc/init.d/functions %{rpminstallroot}/etc/udev/rules.d/99-imm.rules %{rpminstallroot}/etc/udev/rules.d/98-mlx.rules -%{rpminstallroot}/sbin/setupimmnic -%{rpminstallroot}/sbin/loadmlxeth +%{rpminstallroot}/usr/sbin/setupimmnic +%{rpminstallroot}/usr/sbin/loadmlxeth %exclude %{rpminstallroot}/debian/*