Skip to content

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

cleanup/install2: do not export GLOABAL_CLEANUP_PACKAGES from script

parent ef7a6561
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
features.in/cleanup/install2/image-scripts.d/90-cleanup-pkgs
View file @ 0e7eb967
...@@ -9,8 +9,7 @@ fi >&2 ...@@ -9,8 +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
export GLOBAL_CLEANUP_PACKAGES="$GLOBAL_CLEANUP_PACKAGES \ CLEANUP_PACKAGES="$GLOBAL_CLEANUP_PACKAGES $GLOBAL_CLEANUP_BASE_PACKAGES"
$GLOBAL_CLEANUP_BASE_PACKAGES"
SCRIPT="/usr/share/install2/postinstall.d/01-remove-pkgs" SCRIPT="/usr/share/install2/postinstall.d/01-remove-pkgs"
...@@ -20,10 +19,10 @@ cat > "$SCRIPT" << EOF ...@@ -20,10 +19,10 @@ cat > "$SCRIPT" << EOF
. install2-init-functions . install2-init-functions
# don't override the script start message on the same line # don't override the script start message on the same line
echo "removing $GLOBAL_CLEANUP_PACKAGES" echo "removing $CLEANUP_PACKAGES"
# remove temporary packages from the installed system # remove temporary packages from the installed system
list="\$(exec_chroot rpmquery -a --qf='%{NAME}\\n' $GLOBAL_CLEANUP_PACKAGES)" list="\$(exec_chroot rpmquery -a --qf='%{NAME}\\n' $CLEANUP_PACKAGES)"
[ -z "\$list" ] || exec_chroot apt-get remove -f -y -- \$list [ -z "\$list" ] || exec_chroot apt-get remove -f -y -- \$list
EOF EOF
chmod +x "$SCRIPT" chmod +x "$SCRIPT"
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