Fix release tarballs

Tell make dist to ship config/.
Fix the filename for the sysvinit job.
And release rc2 with this fix.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/Makefile.am b/Makefile.am
index 8ff22d8a78cc69ba69971072720bbf110d5d77e7..f555fb1e0414eb9c41985ad30cc740ce1c4d1622 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = tests share config
-DIST_SUBDIRS = tests share
+DIST_SUBDIRS = tests share config
 
 AM_CFLAGS = -Wall -ggdb -D_GNU_SOURCE -DSBINDIR=\"$(SBINDIR)\" -pthread
 AM_CFLAGS += $(FUSE_CFLAGS)

diff --git a/config/init/sysvinit/lxcfs b/config/init/sysvinit/lxcfs
new file mode 100755 (executable)
index 0000000..21a9c61
--- /dev/null
+++ b/config/init/sysvinit/lxcfs
@@ -0,0 +1,96 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Short-Description:    FUSE filesystem for LXC
+# Description:          FUSE filesystem for LXC
+# Provides:             lxcfs
+# Required-Start:       $remote_fs
+# Required-Stop:        $remote_fs
+# Default-Start:        2 3 4 5
+# Default-Stop:         0 1 6
+### END INIT INFO
+
+DAEMON=/usr/bin/lxcfs
+NAME=lxcfs
+DESC="FUSE filesystem for LXC"
+PIDFILE=/var/run/lxcfs.pid
+
+. /lib/lsb/init-functions
+
+test -f ${DAEMON} || exit 0
+
+set -e
+
+START="-m --start --quiet --pidfile ${PIDFILE} --name ${NAME} --startas $DAEMON --background"
+case "$1" in
+    start)
+        if init_is_upstart; then
+            exit 1
+        fi
+
+        # Don't start if bind-mounted from host
+        [ ! -d /var/lib/lxcfs/proc ] || exit 0
+
+        # Cleanup in case of crash
+        fusermount -u /var/lib/lxcfs 2> /dev/null || true
+        [ -L /etc/mtab ] || \
+            sed -i "/^lxcfs \/var\/lib\/lxcfs fuse.lxcfs/d" /etc/mtab
+
+        echo -n "Starting $DESC: "
+        if start-stop-daemon ${START} -- /var/lib/lxcfs >/dev/null 2>&1 ; then
+            echo "${NAME}."
+        else
+            if start-stop-daemon --test ${START} >/dev/null 2>&1; then
+                echo "(failed)."
+                exit 1
+            else
+                echo "${DAEMON} already running."
+                exit 0
+            fi
+        fi
+
+        exit 0
+    ;;
+
+    stop)
+        if init_is_upstart; then
+            exit 0
+        fi
+        echo -n "Stopping $DESC: "
+        if start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \
+            --startas ${DAEMON} --retry 10 --name ${NAME} \
+            >/dev/null 2>&1 ; then
+                echo "${NAME}."
+        else
+            if start-stop-daemon --test ${START} >/dev/null 2>&1; then
+                echo "(not running)."
+                exit 0
+            else
+                echo "(failed)."
+                exit 1
+            fi
+        fi
+
+        exit 0
+    ;;
+
+    status)
+        if init_is_upstart; then
+            exit 0
+        fi
+        status_of_proc -p ${PIDFILE} "${DAEMON}" lxcfs
+    ;;
+
+    restart|force-reload)
+        if init_is_upstart; then
+            exit 1
+        fi
+        $0 stop
+        exec $0 start
+    ;;
+
+    *)
+        echo "Usage: $0 {start|stop|restart|force-reload}" 1>&2
+        exit 1
+    ;;
+esac

diff --git a/config/init/sysvinit/lxcfs.init b/config/init/sysvinit/lxcfs.init
deleted file mode 100755 (executable)
index 21a9c61..0000000
--- a/config/init/sysvinit/lxcfs.init
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Short-Description:    FUSE filesystem for LXC
-# Description:          FUSE filesystem for LXC
-# Provides:             lxcfs
-# Required-Start:       $remote_fs
-# Required-Stop:        $remote_fs
-# Default-Start:        2 3 4 5
-# Default-Stop:         0 1 6
-### END INIT INFO
-
-DAEMON=/usr/bin/lxcfs
-NAME=lxcfs
-DESC="FUSE filesystem for LXC"
-PIDFILE=/var/run/lxcfs.pid
-
-. /lib/lsb/init-functions
-
-test -f ${DAEMON} || exit 0
-
-set -e
-
-START="-m --start --quiet --pidfile ${PIDFILE} --name ${NAME} --startas $DAEMON --background"
-case "$1" in
-    start)
-        if init_is_upstart; then
-            exit 1
-        fi
-
-        # Don't start if bind-mounted from host
-        [ ! -d /var/lib/lxcfs/proc ] || exit 0
-
-        # Cleanup in case of crash
-        fusermount -u /var/lib/lxcfs 2> /dev/null || true
-        [ -L /etc/mtab ] || \
-            sed -i "/^lxcfs \/var\/lib\/lxcfs fuse.lxcfs/d" /etc/mtab
-
-        echo -n "Starting $DESC: "
-        if start-stop-daemon ${START} -- /var/lib/lxcfs >/dev/null 2>&1 ; then
-            echo "${NAME}."
-        else
-            if start-stop-daemon --test ${START} >/dev/null 2>&1; then
-                echo "(failed)."
-                exit 1
-            else
-                echo "${DAEMON} already running."
-                exit 0
-            fi
-        fi
-
-        exit 0
-    ;;
-
-    stop)
-        if init_is_upstart; then
-            exit 0
-        fi
-        echo -n "Stopping $DESC: "
-        if start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \
-            --startas ${DAEMON} --retry 10 --name ${NAME} \
-            >/dev/null 2>&1 ; then
-                echo "${NAME}."
-        else
-            if start-stop-daemon --test ${START} >/dev/null 2>&1; then
-                echo "(not running)."
-                exit 0
-            else
-                echo "(failed)."
-                exit 1
-            fi
-        fi
-
-        exit 0
-    ;;
-
-    status)
-        if init_is_upstart; then
-            exit 0
-        fi
-        status_of_proc -p ${PIDFILE} "${DAEMON}" lxcfs
-    ;;
-
-    restart|force-reload)
-        if init_is_upstart; then
-            exit 1
-        fi
-        $0 stop
-        exec $0 start
-    ;;
-
-    *)
-        echo "Usage: $0 {start|stop|restart|force-reload}" 1>&2
-        exit 1
-    ;;
-esac

diff --git a/configure.ac b/configure.ac
index be763836384baf5eeb015761d9a7d45d5783aad0..341c40defbc70ce90215f76b342982beeeae738c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([lxcfs], [2.0.0.rc1], [lxc-devel@lists.linuxcontainers.org])
+AC_INIT([lxcfs], [2.0.0.rc2], [lxc-devel@lists.linuxcontainers.org])
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 AC_CONFIG_MACRO_DIR([m4])