git://git.onelab.eu
/
util-vserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cfa375b
)
Added vsh.
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Mon, 11 Oct 2004 18:08:11 +0000
(18:08 +0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Mon, 11 Oct 2004 18:08:11 +0000
(18:08 +0000)
util-vserver.spec
patch
|
blob
|
history
diff --git
a/util-vserver.spec
b/util-vserver.spec
index
e8ba46d
..
42c9684
100644
(file)
--- a/
util-vserver.spec
+++ b/
util-vserver.spec
@@
-51,19
+51,18
@@
linuxconf.
%prep
%setup -q
%prep
%setup -q
-
-
-%build
aclocal -I m4
autoconf
aclocal -I m4
autoconf
-automake
+automake
--add-missing
# bootstrap to avoid BuildRequires of kernel-source
for linux in $RPM_BUILD_DIR/linux-* /lib/modules/`uname -r`/build ; do
[[ -d $linux/include ]] && %configure --with-kerneldir=$linux --enable-linuxconf && break
done
# bootstrap to avoid BuildRequires of kernel-source
for linux in $RPM_BUILD_DIR/linux-* /lib/modules/`uname -r`/build ; do
[[ -d $linux/include ]] && %configure --with-kerneldir=$linux --enable-linuxconf && break
done
-%__make %{?_smp_mflags}
+%build
+make
+
%install
rm -rf $RPM_BUILD_ROOT
%__make DESTDIR=$RPM_BUILD_ROOT install
%install
rm -rf $RPM_BUILD_ROOT
%__make DESTDIR=$RPM_BUILD_ROOT install
@@
-74,11
+73,9
@@
test "%_initrddir" = %_sysconfdir/init.d || {
mv ${RPM_BUILD_ROOT}%_sysconfdir/init.d/* ${RPM_BUILD_ROOT}%_initrddir/
}
mv ${RPM_BUILD_ROOT}%_sysconfdir/init.d/* ${RPM_BUILD_ROOT}%_initrddir/
}
-
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
-
%define services vcached vservers
%pre
%define services vcached vservers
%pre
@@
-89,7
+86,6
@@
if [ $1 -eq 2 ] ; then
done
fi
done
fi
-
%post
# 1 = install, 2 = upgrade/reinstall
if [ $1 -eq 1 ] ; then
%post
# 1 = install, 2 = upgrade/reinstall
if [ $1 -eq 1 ] ; then
@@
-101,10
+97,19
@@
fi
for i in %{services} ; do
[ "`/sbin/runlevel`" = "unknown" ] || service $i start
done
for i in %{services} ; do
[ "`/sbin/runlevel`" = "unknown" ] || service $i start
done
+if [ ! -f /etc/shells ] || ! grep -q '^/usr/sbin/vsh$' /etc/shells ; then
+ echo /usr/sbin/vsh >> /etc/shells
+fi
%__chattr +t /vservers || :
%__chattr +t /vservers || :
+%postun
+# 0 = erase, 1 = upgrade
+if [ "$1" = 0 ] ; then
+ perl -i -n -e 'next if /^\/usr\/sbin\/vsh$/; print' /etc/shells
+fi
+
%preun
# 0 = erase, 1 = upgrade
if [ $1 -eq 0 ] ; then
%preun
# 0 = erase, 1 = upgrade
if [ $1 -eq 0 ] ; then
@@
-115,7
+120,6
@@
if [ $1 -eq 0 ] ; then
done
fi
done
fi
-
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
@@
-129,19
+133,21
@@
fi
%config(noreplace) /etc/vcached.conf
%dir /etc/vservers
%attr(0,root,root) %dir /vservers
%config(noreplace) /etc/vcached.conf
%dir /etc/vservers
%attr(0,root,root) %dir /vservers
+%attr(4755,root,root) /usr/sbin/vsh
%exclude %_sbindir/newvserver
%exclude %_mandir/man8/newvserver*
%exclude %_sbindir/newvserver
%exclude %_mandir/man8/newvserver*
-
%files linuxconf
%defattr(-,root,root)
%config(noreplace) /etc/vservers/newvserver.defaults
%_sbindir/newvserver
%_mandir/man8/newvserver*
%files linuxconf
%defattr(-,root,root)
%config(noreplace) /etc/vservers/newvserver.defaults
%_sbindir/newvserver
%_mandir/man8/newvserver*
-
%changelog
%changelog
+* Mon Oct 11 2004 Marc E. Fiuczynski <mef@cs.princeton.edu> 0.1-1.planetlab
+- added vsh
+
* Wed Aug 11 2004 Mark Huang <mlhuang@cs.princeton.edu> 0.29-1.planetlab
- initial PlanetLab 3.0 build.
* Wed Aug 11 2004 Mark Huang <mlhuang@cs.princeton.edu> 0.29-1.planetlab
- initial PlanetLab 3.0 build.
@@
-150,3
+156,4
@@
fi
* Fri Sep 26 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0:0.23.4-1
- initial build.
* Fri Sep 26 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0:0.23.4-1
- initial build.
+