Skip to content

images: fix stale header comments and drop unset $SUDO #41

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

Open
ROKUMATE wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −10
Open

images: fix stale header comments and drop unset $SUDO #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions images/debian_packaging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash

# This script is called from debian_setup.sh and various Dockerfiles.
# It's not intended to be used outside of those contexts. It assumes the lib.sh
# library has already been sourced, and that all "ground-up" package-related activity
# needs to be done, including repository setup and initial update.
# This script is called from build.sh, in the guest via virt-customize.
# It's not intended to be used outside of that context. It assumes that all
# "ground-up" package-related activity needs to be done, including repository
# setup and initial update.

set -e

Expand Down
9 changes: 4 additions & 5 deletions images/fedora_packaging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

# This script is called from fedora_setup.sh and various Dockerfiles.
# It's not intended to be used outside of those contexts. It assumes the lib.sh
# library has already been sourced, and that all "ground-up" package-related activity
# This script is called from build.sh, in the guest via virt-customize, and from
# container-images/podman_cidev/Containerfile. It's not intended to be used outside
# of those contexts. It assumes that all "ground-up" package-related activity
# needs to be done, including repository setup and initial update.

set -e
Expand All @@ -20,7 +20,6 @@ BUILD_NAME="${1:?Build name is not defined, must be given as first arg}"
# receive container-related dependency updates at the same time. Since
# the 'prior' release has the shortest support lifetime, keep it's behavior
# stable by only using released updates.
# shellcheck disable=SC2154
if [[ "$BUILD_NAME" == "fedora-current" ]]; then
echo "Enabling updates-testing repository for $BUILD_NAME"
dnf install -y 'dnf-command(config-manager)'
Expand Down Expand Up @@ -213,7 +212,7 @@ if ! ((CONTAINER)); then
# Do not use 100% so we do not run out of memory for the process itself if tests start leaking big
# files on /tmp.
mkdir -p /etc/systemd/system/tmp.mount.d
echo -e "[Mount]\nOptions=size=75%%,mode=1777\n" | $SUDO tee /etc/systemd/system/tmp.mount.d/override.conf
echo -e "[Mount]\nOptions=size=75%%,mode=1777\n" | tee /etc/systemd/system/tmp.mount.d/override.conf

# "Enabling cgroup management from containers"
setsebool -P container_manage_cgroup true
Expand Down
2 changes: 1 addition & 1 deletion images/get_fedora_url.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# This script is intended to be called by the Makefile, not by
# This script is intended to be called by build.sh, not by
# humans. This implies certain otherwise "odd" behaviors, such
# as exiting with no std-output if there was an error. It expects
# to be called with three arguments:
Expand Down