bugfix: rename lxcfs to pouch-lxcfs in pouch.rpm

Signed-off-by: letty <letty.ll@alibaba-inc.com>
AliyunContainerService · Jun 8, 2018 · fc09ea7 · fc09ea7
1 parent 4782518
commit fc09ea7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/hack/package/rpm/build.sh b/hack/package/rpm/build.sh
@@ -39,6 +39,9 @@ function build_lxcfs ()
 {
     pushd "$LXC_DIR"
     git clone -b "$LXC_BRANCH" https://github.com/lxc/lxcfs.git && cd lxcfs
+
+    # change liblxcfs.so to libpouchlxcfs.so
+    sed -i 's/liblxcfs/libpouchlxcfs/g' $(grep -r "liblxcfs" . |awk -F':' '{print $1}'|uniq )
     ./bootstrap.sh > /dev/null 2>&1
     ./configure > /dev/null 2>&1
     make install DESTDIR="$LXC_DIR" > /dev/null 2>&1
@@ -108,9 +111,8 @@ function build_rpm ()
           -d fuse \
           "$BINDIR/"=/usr/local/bin/ \
           "$SERVICEDIR/"=/usr/lib/systemd/system/ \
-          "$LXC_DIR/usr/local/bin/lxcfs"=/usr/bin/lxcfs \
-          "$LXC_DIR/usr/local/lib/lxcfs/liblxcfs.so"=/usr/lib64/liblxcfs.so \
-          "$LXC_DIR/usr/local/share/"=/usr/share
+          "$LXC_DIR/usr/local/bin/lxcfs"=/usr/bin/pouch-lxcfs \
+          "$LXC_DIR/usr/local/lib/lxcfs/libpouchlxcfs.so"=/usr/lib64/libpouchlxcfs.so \
 
 }
 

diff --git a/hack/package/rpm/scripts/after-install.sh b/hack/package/rpm/scripts/after-install.sh
@@ -7,6 +7,6 @@ if ! getent group pouch > /dev/null; then
 	groupadd --system pouch
 fi
 
-if [ ! -d "/var/lib/lxcfs" ] ; then
-    mkdir -p /var/lib/lxcfs
+if [ ! -d "/var/lib/pouch-lxcfs" ] ; then
+    mkdir -p /var/lib/pouch-lxcfs
 fi
diff --git a/hack/package/rpm/service/lxcfs.service → hack/package/rpm/service/pouch-lxcfs.service b/hack/package/rpm/service/lxcfs.service → hack/package/rpm/service/pouch-lxcfs.service
@@ -5,10 +5,10 @@ Before=lxc.service
 Documentation=man:lxcfs(1)
 
 [Service]
-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
+ExecStart=/usr/bin/pouch-lxcfs /var/lib/pouch-lxcfs/
 KillMode=process
 Restart=on-failure
-ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ExecStopPost=-/usr/bin/fusermount -u /var/lib/pouch-lxcfs
 Delegate=yes
 ExecStartPost=pouch remount-lxcfs