Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

strict elemental setup #2201

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

strict elemental setup #2201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40a1d51
Use --strict flag in elemental-setup services
frelon Oct 2, 2024
e10fd8a
Set SilenceUsage for run-stage command
frelon Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/run-stage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ func NewRunStage(root *cobra.Command) *cobra.Command {
return elementalError.NewFromError(err, elementalError.ReadingRunConfig)
}

cmd.SilenceUsage = true

err = utils.RunStage(&cfg.Config, args[0], cfg.Strict, cfg.CloudInitPaths...)
return elementalError.NewFromError(err, elementalError.CloudInitRunStage)
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-boot.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Before=getty.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/elemental run-stage boot
ExecStart=/usr/bin/elemental run-stage --strict boot

[Install]
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-fs.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Before=sysinit.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/elemental run-stage fs
ExecStart=/usr/bin/elemental run-stage --strict fs

[Install]
WantedBy=sysinit.target
2 changes: 1 addition & 1 deletion pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-initramfs.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RootDirectory=/sysroot
BindPaths=/proc /sys /dev /run /tmp
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/elemental run-stage initramfs
ExecStart=/usr/bin/elemental run-stage --strict initramfs

[Install]
WantedBy=initrd.target
2 changes: 1 addition & 1 deletion pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-network.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Nice=19
IOSchedulingClass=2
IOSchedulingPriority=7
Type=oneshot
ExecStart=/usr/bin/elemental run-stage network
ExecStart=/usr/bin/elemental run-stage --strict network
TimeoutStopSec=180
KillMode=process
KillSignal=SIGINT
Expand Down
4 changes: 2 additions & 2 deletions pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-pre-rootfs.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Conflicts=initrd-switch-root.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/elemental run-stage pre-rootfs
ExecStart=/usr/bin/elemental run-stage --strict pre-rootfs

[Install]
WantedBy=initrd-root-device.target
WantedBy=initrd-root-device.target
2 changes: 1 addition & 1 deletion pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-reconcile.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Nice=19
IOSchedulingClass=2
IOSchedulingPriority=7
Type=oneshot
ExecStart=/bin/bash -c "systemd-inhibit /usr/bin/elemental run-stage reconcile"
ExecStart=/bin/bash -c "systemd-inhibit /usr/bin/elemental run-stage --strict reconcile"
TimeoutStopSec=180
KillMode=process
KillSignal=SIGINT
Expand Down
2 changes: 1 addition & 1 deletion pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-rootfs.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Conflicts=initrd-switch-root.target
Type=oneshot
RemainAfterExit=yes
ExecStartPre=/usr/bin/ln -sf -t / /sysroot/system
ExecStart=/usr/bin/elemental run-stage rootfs
ExecStart=/usr/bin/elemental run-stage --strict rootfs

[Install]
WantedBy=initrd-root-fs.target
Loading