Skip to content

Commit

Permalink
Followup fix for .profile.extra
Browse files Browse the repository at this point in the history
Allow to source .profile.extra such that it is possible to
read and act on e.g cmdline parameters. This is related to
bsc#1218095
  • Loading branch information
schaefi committed Feb 19, 2024
1 parent fb69627 commit 8e49560
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dracut/modules.d/99kiwi-lib/kiwi-dialog-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function _setup_interactive_service {
echo "Wants=systemd-vconsole-setup.service"
echo "Conflicts=emergency.service emergency.target"
echo "[Service]"
echo "EnvironmentFile=/.profile.extra"
echo "EnvironmentFile=/dialog_profile"
echo "Environment=HOME=/"
echo "Environment=DRACUT_SYSTEMD=1"
echo "Environment=NEWROOT=/sysroot"
Expand Down
6 changes: 3 additions & 3 deletions dracut/modules.d/99kiwi-lib/kiwi-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,10 @@ function initialize {

import_file ${profile}

test -f ${profile_extra} || \
cat >${profile_extra}</dev/null
test -f ${profile_extra} && source ${profile_extra}

import_file ${profile_extra}
# Used in the systemd dialog unit
env >/dialog_profile

# Handle overwrites
kiwi_oem_installdevice=$(getarg rd.kiwi.oem.installdevice=)
Expand Down
2 changes: 1 addition & 1 deletion dracut/modules.d/99kiwi-lib/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ depends() {
install() {
declare moddir=${moddir}
inst_multiple \
blkid blockdev dd mkdir rmdir \
blkid blockdev dd mkdir rmdir env \
grep cut tail head tr bc true false mountpoint \
basename sfdisk sgdisk mkswap readlink lsblk \
btrfs xfs_growfs resize2fs \
Expand Down

0 comments on commit 8e49560

Please sign in to comment.