From: Marco Yuen <marcoy@cs.princeton.edu>
Date: Fri, 16 Dec 2011 17:16:01 +0000 (-0500)
Subject: Move creation of subvolumes to initscript
X-Git-Tag: lxcbuild~9
X-Git-Url: http://git.onelab.eu/?p=lxc-reference.git;a=commitdiff_plain;h=2e94be02f5a456cb9ff3e559b6d638f086efbe22

Move creation of subvolumes to initscript
---

diff --git a/initscript/lxc-reference b/initscript/lxc-reference
new file mode 100644
index 0000000..84e83d4
--- /dev/null
+++ b/initscript/lxc-reference
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+case "$1" in
+    start|restart|reload)
+        ;;
+    force)
+        FORCE=true;;
+    stop|status)
+        exit 0
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|restart|reload|status|force}"
+        exit 1
+        ;;
+esac
+
+# Source function library
+. /etc/init.d/functions
+
+VERSION=`yum info lxc-reference | grep Version | awk '{ print $3; }'`
+
+if [ -f /vservers/lxc-reference-${VERSION}.tgz ]; then
+    mkdir -p /vservers/.lvref
+    btrfs subvolume /vservers/.lvref/lxc-f14-x86_86
+    btrfs subvolume /vservers/.lvref/lxc-squeeze-x86_86
+    tar zxvf /vservers/lxc-reference-${VERSION}.tgz -C /vservers/tmp
+    rm -rf /vservers/lxc-reference-${VERSION}.tgz
+fi
+
+exit 0
+
diff --git a/lxc-reference.spec b/lxc-reference.spec
index 2beaf20..ae79c49 100644
--- a/lxc-reference.spec
+++ b/lxc-reference.spec
@@ -21,20 +21,11 @@ Requires: btrfs-progs
 A simple package to deploy reference images for lxc
 
 %prep
-touch $RPM_BUILD_DIR/configure
-chmod +x $RPM_BUILD_DIR/configure
 wget %{source}
 
 %install
-mkdir -p $RPM_BUILD_ROOT/vservers/
-cp $RPM_BUILD_DIR/lxc-reference-%{version}.tgz $RPM_BUILD_ROOT/vservers/
-
-%post
-mkdir /vservers/.lvref
-btrfs subvolume /vservers/.lvref/lxc-f14-x86_86
-btrfs subvolume /vservers/.lvref/lxc-squeeze-x86_86
-tar zxvf /vservers/lxc-reference-%{version}.tgz -C /vservers/tmp
-rm -rf /vservers/lxc-reference-%{version}.tgz
+install -D -m 644 $RPM_BUILD_DIR/lxc-reference-%{version}.tgz $RPM_BUILD_ROOT/vservers/lxc-reference-%{version}.tgz
+install -D -m 755 $RPM_BUILD_DIR/initscript/lxc-reference $RPM_BUILD_ROOT/%{_initrddir}/lxc-reference
 
 %preun
 btrfs subvolume delete /vservers/.lvref/lxc-f14-x86_64
@@ -47,11 +38,13 @@ rm -rf $RPM_BUILD_DIR/*
 
 %files
 /vservers/lxc-reference-%{version}.tgz
+%{_initrddir}/lxc-reference
 
 %changelog
 * Fri Dec 16 2011 Marco Yuen <marcoy@cs.princeton.edu> - lxc-reference-0.1
 - Add dependency (btrfs-progs).
 - Change source URL.
+- Add initscript.
 
 * Wed Nov 30 2011 Xavier Leon <xleon@ac.upc.edu> - lxc-reference-0.1
 - First dumb version of the reference image