Skip to content

M
mkimage-profiles
Commit d4f6fbee authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

cleanup, control, services: fix conditions for installer >= 1.16.3

parent 5fe74d57
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
features.in/cleanup/live/image-scripts.d/90-cleanup-live-install-pkgs
View file @ d4f6fbee
...@@ -9,7 +9,7 @@ fi >&2 ...@@ -9,7 +9,7 @@ fi >&2
[ -n "$GLOBAL_CLEANUP_PACKAGES" ] || [ -n "$GLOBAL_CLEANUP_PACKAGES" ] ||
[ -n "$GLOBAL_CLEANUP_BASE_PACKAGES" ] || exit 0 [ -n "$GLOBAL_CLEANUP_BASE_PACKAGES" ] || exit 0
[ -x /usr/sbin/install2-init ] || exit 0 [ -x /usr/sbin/install2 ] || [ -x /usr/libexec/install2/install2 ] || exit 0
CLEANUP_PACKAGES="$GLOBAL_CLEANUP_PACKAGES $GLOBAL_CLEANUP_BASE_PACKAGES" CLEANUP_PACKAGES="$GLOBAL_CLEANUP_PACKAGES $GLOBAL_CLEANUP_BASE_PACKAGES"
......
features.in/control/live/image-scripts.d/51-control-install
View file @ d4f6fbee
#!/bin/sh #!/bin/sh
# setup control(8) states for the installed system # setup control(8) states for the installed system
[ -z "$GLOBAL_CONTROL" ] || [ ! -x /usr/sbin/install2 ] || [ -n "$GLOBAL_CONTROL" ] || [ -x /usr/sbin/install2 ] || [ -x /usr/libexec/install2/install2 ] || exit 0
echo "$GLOBAL_CONTROL" | echo "$GLOBAL_CONTROL" | tr ' :' '\n ' > /usr/share/install2/control
tr ' :' '\n ' > /usr/share/install2/control
features.in/services/live/image-scripts.d/10-services-install
View file @ d4f6fbee
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# but is executed during a live build if there is an classic # but is executed during a live build if there is an classic
# installer in it. # installer in it.
[ -x /usr/sbin/install2 ] || exit 0 [ -x /usr/sbin/install2 ] || [ -x /usr/libexec/install2/install2 ] || exit 0
STATUS=`mktemp` STATUS=`mktemp`
CONFDIR=/usr/share/install2 CONFDIR=/usr/share/install2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment