Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
arch-boxes
Commits
d10e8765
Commit
d10e8765
authored
Dec 13, 2020
by
Sven-Hendrik Haase
Browse files
Merge branch 'source-ftw' into 'master'
Use source for sourcing instead of . See merge request
!152
parents
7c277938
cdcd7961
Pipeline
#3548
passed with stages
in 36 minutes and 42 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
build-inside-vm.sh
View file @
d10e8765
...
@@ -162,7 +162,7 @@ function main() {
...
@@ -162,7 +162,7 @@ function main() {
setup_disk
setup_disk
bootstrap
bootstrap
# shellcheck source=images/base.sh
# shellcheck source=images/base.sh
.
"
${
ORIG_PWD
}
/images/base.sh"
source
"
${
ORIG_PWD
}
/images/base.sh"
pre
pre
unmount_image
unmount_image
...
@@ -176,10 +176,10 @@ function main() {
...
@@ -176,10 +176,10 @@ function main() {
fi
fi
# shellcheck source=images/common.sh
# shellcheck source=images/common.sh
.
"
${
ORIG_PWD
}
/images/common.sh"
source
"
${
ORIG_PWD
}
/images/common.sh"
for
image
in
"
${
ORIG_PWD
}
/images/"
!(
base|common
)
.sh
;
do
for
image
in
"
${
ORIG_PWD
}
/images/"
!(
base|common
)
.sh
;
do
# shellcheck source=/dev/null
# shellcheck source=/dev/null
.
"
${
image
}
"
source
"
${
image
}
"
create_image
"
${
IMAGE_NAME
}
"
pre post
create_image
"
${
IMAGE_NAME
}
"
pre post
done
done
}
}
...
...
images/base.sh
View file @
d10e8765
...
@@ -61,7 +61,7 @@ EOF
...
@@ -61,7 +61,7 @@ EOF
# enabling important services
# enabling important services
arch-chroot
"
${
MOUNT
}
"
/bin/bash
-e
<<
EOF
arch-chroot
"
${
MOUNT
}
"
/bin/bash
-e
<<
EOF
.
/etc/profile
source
/etc/profile
systemctl enable sshd
systemctl enable sshd
systemctl enable haveged
systemctl enable haveged
systemctl enable systemd-networkd
systemctl enable systemd-networkd
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment