From: SangYoun Kwak Date: Wed, 31 Aug 2022 01:54:20 +0000 (+0900) Subject: Remove feature-init_wrapper X-Git-Tag: accepted/tizen/7.0/unified/20221110.055940^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fda0d2e4d1e3f5ed54a989cd1de8ede36ea89998;p=platform%2Fadaptation%2Fsystem-plugin.git Remove feature-init_wrapper Change-Id: Iea2ab6ec1a26b05b627e7ed170694b2508299902 Signed-off-by: SangYoun Kwak --- diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 705526a..8e66d76 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -33,14 +33,6 @@ BuildArch: noarch %description device-circle This package provides Circle specific system configuration files. -%package feature-init_wrapper -Summary: Support init.wrapper booting. -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description feature-init_wrapper -This package provides init.wrapper and init symlink file for init wrapper booting. - %package feature-image-reduction Summary: System configuration files for reducing image size Requires: %{name} = %{version}-%{release} @@ -170,9 +162,6 @@ ln -s ../tizen-fstrim-user.timer %{buildroot}%{_unitdir}/delayed.target.wants/ti install -m 644 units/tizen-fstrim-user.service %{buildroot}%{_unitdir} install -m 755 scripts/tizen-fstrim-on-charge.sh %{buildroot}%{_bindir} -# init_wrapper -install -m 755 scripts/init.wrapper %{buildroot}%{_sbindir} - # headless install -m 755 scripts/sdb-mode.sh %{buildroot}%{_bindir} install -m 755 scripts/headless_env.sh %{buildroot}%{_sysconfdir}/profile.d @@ -261,14 +250,6 @@ systemctl daemon-reload %{_unitdir}/csa.mount %{_unitdir}/local-fs.target.wants/csa.mount -%files feature-init_wrapper -%license LICENSE.Apache-2.0 -%{_sbindir}/init.wrapper - -%posttrans feature-init_wrapper -rm -f /sbin/init -ln -s /sbin/init.wrapper /sbin/init - %posttrans feature-image-reduction # platform/upstream/dbus rm -f %{_bindir}/dbus-cleanup-sockets diff --git a/scripts/init.wrapper b/scripts/init.wrapper deleted file mode 100644 index 691cae9..0000000 --- a/scripts/init.wrapper +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -PATH=/bin:/usr/bin:/sbin:/usr/sbin -SYSTEM_MNT=/opt -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 -if [ x$ROOTFS = "x" ] -then - ROOTFS=`/sbin/blkid -t LABEL=emulator-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 -if [ x$DATAFS = "x" ] -then - DATAFS=`/sbin/blkid -t LABEL=emulator-sysdata -o device` -fi - -#Fsck, resize, mount devices -if [ x$ROOTFS = "x" ] -then - echo "Warning : There is no rootfs partition." -else - /sbin/fsck -y $ROOTFS - /usr/bin/mount -o remount,rw $ROOTFS - /sbin/resize2fs -f $ROOTFS - /usr/bin/mount -o remount,ro $ROOTFS -fi - -if [ x$MODULES = "x" ] -then - echo "Warning : There is no modules partition." -else - /sbin/fsck -y $MODULES - /sbin/resize2fs -f $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 - -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