SPECS: util-vserver.spec - um, the usual way of recovering .rpmsave

[glen]

Author: glen                         Date: Mon Nov 24 00:41:18 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- um, the usual way of recovering .rpmsave

---- Files affected:
SPECS:
   util-vserver.spec (1.214 -> 1.215) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.214 SPECS/util-vserver.spec:1.215
--- SPECS/util-vserver.spec:1.214	Mon Nov 24 01:38:44 2008
+++ SPECS/util-vserver.spec	Mon Nov 24 01:41:12 2008
@@ -546,26 +546,20 @@
 chmod a-x /etc/rc.d/init.d/vservers
 
 %triggerpostun -- util-vserver-init
-# Restore what preun from util-vserver-init removed
+# Restore what triggerun from removed
 chmod ug+x /etc/rc.d/init.d/vprocunhide
 chmod ug+x /etc/rc.d/init.d/vrootdevices
 chmod ug+x /etc/rc.d/init.d/vservers
 /sbin/chkconfig --add vrootdevices
 /sbin/chkconfig --add vprocunhide
 /sbin/chkconfig --add vservers
-if [ ! -f /etc/sysconfig/vrootdevices ]; then
-	if [ -f /etc/sysconfig/vrootdevices.rpmsave ]; then
-		mv -f /etc/sysconfig/vrootdevices.rpmsave /etc/sysconfig/vrootdevices
-	else
-		mv -f /etc/sysconfig/vrootdevices.rpmnew /etc/sysconfig/vrootdevices
-	fi
+if [ -f /etc/sysconfig/vrootdevices.rpmsave ]; then
+	cp -f /etc/sysconfig/vrootdevices{,.rpmnew}
+	mv -f /etc/sysconfig/vrootdevices{.rpmsave,}
 fi
-if [ ! -f /etc/sysconfig/vservers ]; then
-	if [ -f /etc/sysconfig/vservers.rpmsave ]; then
-		mv -f /etc/sysconfig/vservers.rpmsave /etc/sysconfig/vservers
-	else
-		mv -f /etc/sysconfig/vservers.rpmnew /etc/sysconfig/vservers
-	fi
+if [ -f /etc/sysconfig/vservers.rpmsave ]; then
+	cp -f /etc/sysconfig/vservers{,.rpmnew}
+	mv -f /etc/sysconfig/vservers{.rpmsave,}
 fi
 
 %post
@@ -904,6 +898,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.215  2008/11/24 00:41:12  glen
+- um, the usual way of recovering .rpmsave
+
 Revision 1.214  2008/11/24 00:38:44  glen
 - typo?
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/util-vserver.spec?r1=1.214&r2=1.215&f=u