Remove unused init_wrapper_overlayfs package

Change-Id: I70d0e83385228773a89b54fd4a7a4a3c32663029
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index 1c10139774f1db1928b2b801ad61c8906e0c0445..7ec679aafaaa555550735e05e58ae7fa4252994e 100644 (file)
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -41,15 +41,6 @@ BuildArch: noarch
 %description feature-init_wrapper
 This package provides init.wrapper and init symlink file for init wrapper booting.
 
-%package feature-init_wrapper_overlayfs
-Summary: Support init.wrapper and overlayfs booting.
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description feature-init_wrapper_overlayfs
-This package provides init.wrapper and init symlink file for init wrapper booting.
-In addition, overlayfs is mounted upon the rootfs.
-
 %package feature-image-reduction
 Summary:  System configuration files for reducing image size
 Requires: %{name} = %{version}-%{release}
@@ -170,7 +161,6 @@ install -m 775 -D scripts/fixed-multi-user.sh %{buildroot}%{_datadir}/fixed_mult
 
 # init_wrapper
 install -m 755 scripts/init.wrapper %{buildroot}%{_sbindir}
-install -m 755 scripts/init.wrapper.overlayfs %{buildroot}%{_sbindir}
 
 # headless
 install -m 755 scripts/sdb-mode.sh %{buildroot}%{_bindir}
@@ -259,16 +249,6 @@ systemctl daemon-reload
 rm -f /sbin/init
 ln -s /sbin/init.wrapper /sbin/init
 
-%files feature-init_wrapper_overlayfs
-%license LICENSE.Apache-2.0
-%{_sbindir}/init.wrapper.overlayfs
-
-%posttrans feature-init_wrapper_overlayfs
-rm -f /sbin/init
-ln -s /sbin/init.wrapper.overlayfs /sbin/init
-mkdir -p /.overlayfs_merged
-mkdir -p /.rootfs_old
-
 %posttrans feature-image-reduction
 # platform/upstream/dbus
 rm -f %{_bindir}/dbus-cleanup-sockets

diff --git a/scripts/init.wrapper.overlayfs b/scripts/init.wrapper.overlayfs
deleted file mode 100644 (file)
index 933dd42..0000000
--- a/scripts/init.wrapper.overlayfs
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-SYSTEM_MNT=/opt
-SYS_BLK_DIR=/sys/class/block
-MODULES_MNT=/usr/lib/modules
-
-mkdir -p /dev /sys /proc
-mount -o nosuid,strictatime,mode=755 -t devtmpfs devtmpfs /dev
-mount -o nosuid,noexec,nodev -t sysfs sysfs /sys
-mount -o nosuid,noexec,nodev -t proc proc /proc
-
-#Find devices with label or partlabel
-ROOTFS=`/sbin/blkid -L rootfs`
-if [ x$ROOTFS = "x" ]
-then
-    ROOTFS=`/sbin/blkid -t PARTLABEL=rootfs -o device`
-fi
-
-MODULES=`/sbin/blkid -L modules`
-if [ x$MODULES = "x" ]
-then
-    MODULES=`/sbin/blkid -t PARTLABEL=module -o device`
-fi
-
-DATAFS=`/sbin/blkid -L system-data`
-if [ x$DATAFS = "x" ]
-then
-    DATAFS=`/sbin/blkid -t PARTLABEL=system-data -o device`
-fi
-
-#Fsck, resize, mount devices
-if [ x$ROOTFS = "x" ]
-then
-    echo "Warning : There is no rootfs partition."
-else
-    /usr/bin/mount -o remount,ro $ROOTFS
-fi
-
-if [ x$MODULES = "x" ]
-then
-    echo "Warning : There is no modules partition."
-else
-    /sbin/resize2fs -f $MODULES
-    /sbin/fsck -y $MODULES
-    /bin/mount $MODULES $MODULES_MNT
-fi
-
-if [ x$DATAFS = "x" ]
-then
-    echo "Warning : There is no system-data partition."
-else
-    /usr/bin/mount | grep "$DATAFS " > /dev/null
-
-    if [ $? = "0" ]
-    then
-        /usr/bin/umount -l "$DATAFS"
-    fi
-    /sbin/fsck -y $DATAFS
-    /sbin/resize2fs -f $DATAFS
-    /usr/bin/mount $DATAFS $SYSTEM_MNT
-fi
-
-mkdir -p /opt/.overlayfs_upper
-mkdir -p /opt/.overlayfs_work
-mount -t overlay overlay -o ro,lowerdir=/,upperdir=/opt/.overlayfs_upper,workdir=/opt/.overlayfs_work /.overlayfs_merged
-mount --make-private /
-mount -M /opt  /.overlayfs_merged/opt
-mount -M /sys  /.overlayfs_merged/sys
-mount -M /proc /.overlayfs_merged/proc
-mount -M /dev  /.overlayfs_merged/dev
-mount -M /usr/lib/modules  /.overlayfs_merged/usr/lib/modules
-/sbin/pivot_root /.overlayfs_merged /.overlayfs_merged/.rootfs_old
-mount --make-shared /
-
-INIT=/usr/lib/systemd/systemd
-if [ $$ = 1 ]; then
-        [ "$INIT" ] && exec "$INIT" "$@"
-fi
-
-echo "======================================================================"
-echo "[/sbin/init] WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "This Message should never be printed. ($INIT execution failure?)"
-echo "======================================================================"
-exec /bin/sh