Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Tom Yan
archiso
Commits
78fe6560
Verified
Commit
78fe6560
authored
Jul 17, 2020
by
nl6720
Browse files
Deprecate customize_airootfs.sh
Show a deprecation notice if airootfs/root/customize_airootfs.sh is found.
parent
df93289b
Changes
2
Hide whitespace changes
Inline
Side-by-side
configs/releng/airootfs/root/customize_airootfs.sh
View file @
78fe6560
...
...
@@ -2,6 +2,8 @@
set
-e
-u
echo
'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version.'
sed
-i
's/#\(en_US\.UTF-8\)/\1/'
/etc/locale.gen
locale-gen
...
...
configs/releng/build.sh
View file @
78fe6560
...
...
@@ -117,14 +117,16 @@ make_setup_mkinitcpio() {
# Customize installation (airootfs)
make_customize_airootfs
()
{
if
[
-n
"
${
verbose
}
"
]
;
then
mkarchiso
-v
-w
"
${
work_dir
}
/x86_64"
-C
"
${
work_dir
}
/pacman.conf"
-D
"
${
install_dir
}
"
\
-r
'/root/customize_airootfs.sh'
run
else
mkarchiso
-w
"
${
work_dir
}
/x86_64"
-C
"
${
work_dir
}
/pacman.conf"
-D
"
${
install_dir
}
"
\
-r
'/root/customize_airootfs.sh'
run
if
[[
-e
"
${
work_dir
}
/x86_64/airootfs/root/customize_airootfs.sh"
]]
;
then
if
[
-n
"
${
verbose
}
"
]
;
then
mkarchiso
-v
-w
"
${
work_dir
}
/x86_64"
-C
"
${
work_dir
}
/pacman.conf"
-D
"
${
install_dir
}
"
\
-r
'/root/customize_airootfs.sh'
run
else
mkarchiso
-w
"
${
work_dir
}
/x86_64"
-C
"
${
work_dir
}
/pacman.conf"
-D
"
${
install_dir
}
"
\
-r
'/root/customize_airootfs.sh'
run
fi
rm
"
${
work_dir
}
/x86_64/airootfs/root/customize_airootfs.sh"
fi
rm
"
${
work_dir
}
/x86_64/airootfs/root/customize_airootfs.sh"
}
# Prepare kernel/initramfs ${install_dir}/boot/
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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