From 1a43dac876c8482c784db5c0ff61e096e00cd120 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Mon, 11 Oct 2004 19:56:46 +0000 Subject: [PATCH] $%^!*& rpm #&!^* Fix to properly install vsh as /bin/vsh. --- util-vserver.spec | 5 +++-- util-vserver.spec.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 1bc0e6f..3518824 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -73,6 +73,9 @@ test "%_initrddir" = %_sysconfdir/init.d || { mv ${RPM_BUILD_ROOT}%_sysconfdir/init.d/* ${RPM_BUILD_ROOT}%_initrddir/ } +mkdir -p ${RPM_BUILD_ROOT}/bin +ln -f ${RPM_BUILD_ROOT}%_sbindir/vsh ${RPM_BUILD_ROOT}/bin/vsh + %clean rm -rf $RPM_BUILD_ROOT @@ -100,7 +103,6 @@ done if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then echo /bin/vsh >> /etc/shells fi -ln -f /usr/sbin/vsh /bin/vsh %__chattr +t /vservers || : @@ -110,7 +112,6 @@ ln -f /usr/sbin/vsh /bin/vsh if [ "$1" = 0 ] ; then perl -i -n -e 'next if /^\/bin\/vsh$/; print' /etc/shells fi -rm -f /usr/sbin/vsh /bin/vsh %preun # 0 = erase, 1 = upgrade diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 6ba68e8..87cb8ef 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -73,6 +73,9 @@ test "%_initrddir" = %_sysconfdir/init.d || { mv ${RPM_BUILD_ROOT}%_sysconfdir/init.d/* ${RPM_BUILD_ROOT}%_initrddir/ } +mkdir -p ${RPM_BUILD_ROOT}/bin +ln -f ${RPM_BUILD_ROOT}%_sbindir/vsh ${RPM_BUILD_ROOT}/bin/vsh + %clean rm -rf $RPM_BUILD_ROOT @@ -100,7 +103,6 @@ done if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then echo /bin/vsh >> /etc/shells fi -ln -f /usr/sbin/vsh /bin/vsh %__chattr +t /vservers || : @@ -110,7 +112,6 @@ ln -f /usr/sbin/vsh /bin/vsh if [ "$1" = 0 ] ; then perl -i -n -e 'next if /^\/bin\/vsh$/; print' /etc/shells fi -rm -f /usr/sbin/vsh /bin/vsh %preun # 0 = erase, 1 = upgrade -- 2.43.0