system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-06 08:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25836 from DaanDeMeyer/reset

Browse source 
firstboot: Add --reset option
This commit is contained in:
Daan De Meyer 2023-04-01 14:33:23 +02:00 committed by GitHub
parent 7f72dca762 05eb2c60bd
commit 407566527d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 77 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
man/systemd-firstboot.xml
View file

@ -264,6 +264,16 @@
<literal>root</literal> user instead of overwriting the entire file.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--reset</option></term>
<listitem><para>If specified, all existing files that are configured by
<command>systemd-firstboot</command> are removed. Note that the files are removed regardless of
whether they'll be configured with a new value or not. This operation ensures that the next boot of
the image will be considered a first boot, and <command>systemd-firstboot</command> will prompt again
to configure each of the removed files.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--delete-root-password</option></term>

62
src/firstboot/firstboot.c
View file

@ -72,6 +72,7 @@ static bool arg_force = false;
static bool arg_delete_root_password = false;
static bool arg_root_password_is_hashed = false;
static bool arg_welcome = true;
static bool arg_reset = false;
STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
STATIC_DESTRUCTOR_REGISTER(arg_image, freep);
@ -334,7 +335,7 @@ static int process_locale(int rfd) {
assert(rfd >= 0);
pfd = chase_and_open_parent_at(rfd, "/etc/locale.conf",
CHASE_AT_RESOLVE_IN_ROOT|CHASE_MKDIR_0755|CHASE_WARN,
CHASE_AT_RESOLVE_IN_ROOT|CHASE_MKDIR_0755|CHASE_WARN|CHASE_NOFOLLOW,
&f);
if (pfd < 0)
return log_error_errno(pfd, "Failed to chase /etc/locale.conf: %m");
@ -423,7 +424,7 @@ static int process_keymap(int rfd) {
assert(rfd >= 0);
pfd = chase_and_open_parent_at(rfd, "/etc/vconsole.conf",
CHASE_AT_RESOLVE_IN_ROOT|CHASE_MKDIR_0755|CHASE_WARN,
CHASE_AT_RESOLVE_IN_ROOT|CHASE_MKDIR_0755|CHASE_WARN|CHASE_NOFOLLOW,
&f);
if (pfd < 0)
return log_error_errno(pfd, "Failed to chase /etc/vconsole.conf: %m");
@ -647,7 +648,7 @@ static int process_machine_id(int rfd) {
assert(rfd >= 0);
pfd = chase_and_open_parent_at(rfd, "/etc/machine-id",
CHASE_AT_RESOLVE_IN_ROOT|CHASE_MKDIR_0755|CHASE_WARN,
CHASE_AT_RESOLVE_IN_ROOT|CHASE_MKDIR_0755|CHASE_WARN|CHASE_NOFOLLOW,
&f);
if (pfd < 0)
return log_error_errno(pfd, "Failed to chase /etc/machine-id: %m");
@ -1064,7 +1065,7 @@ static int process_kernel_cmdline(int rfd) {
assert(rfd >= 0);
pfd = chase_and_open_parent_at(rfd, "/etc/kernel/cmdline",
CHASE_AT_RESOLVE_IN_ROOT|CHASE_MKDIR_0755|CHASE_WARN,
CHASE_AT_RESOLVE_IN_ROOT|CHASE_MKDIR_0755|CHASE_WARN|CHASE_NOFOLLOW,
&f);
if (pfd < 0)
return log_error_errno(pfd, "Failed to chase /etc/kernel/cmdline: %m");
@ -1089,6 +1090,48 @@ static int process_kernel_cmdline(int rfd) {
return 0;
}
static int reset_one(int rfd, const char *path) {
_cleanup_close_ int pfd = -EBADF;
_cleanup_free_ char *f = NULL;
assert(rfd >= 0);
assert(path);
pfd = chase_and_open_parent_at(rfd, path, CHASE_AT_RESOLVE_IN_ROOT|CHASE_WARN|CHASE_NOFOLLOW, &f);
if (pfd == -ENOENT)
return 0;
if (pfd < 0)
return log_error_errno(pfd, "Failed to resolve %s: %m", path);
if (unlinkat(pfd, f, 0) < 0)
return errno == ENOENT ? 0 : log_error_errno(errno, "Failed to remove %s: %m", path);
log_info("Removed %s", path);
return 0;
}
static int process_reset(int rfd) {
int r;
assert(rfd >= 0);
if (!arg_reset)
return 0;
FOREACH_STRING(p,
"/etc/locale.conf",
"/etc/vconsole.conf",
"/etc/hostname",
"/etc/machine-id",
"/etc/kernel/cmdline") {
r = reset_one(rfd, p);
if (r < 0)
return r;
}
return 0;
}
static int help(void) {
_cleanup_free_ char *link = NULL;
int r;
@ -1130,6 +1173,7 @@ static int help(void) {
" --force Overwrite existing files\n"
" --delete-root-password Delete root password\n"
" --welcome=no Disable the welcome text\n"
" --reset Remove existing files\n"
"\nSee the %s for details.\n",
program_invocation_short_name,
link);
@ -1171,6 +1215,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_FORCE,
ARG_DELETE_ROOT_PASSWORD,
ARG_WELCOME,
ARG_RESET,
};
static const struct option options[] = {
@ -1206,6 +1251,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "force", no_argument, NULL, ARG_FORCE },
{ "delete-root-password", no_argument, NULL, ARG_DELETE_ROOT_PASSWORD },
{ "welcome", required_argument, NULL, ARG_WELCOME },
{ "reset", no_argument, NULL, ARG_RESET },
{}
};
@ -1408,6 +1454,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_welcome = r;
break;
case ARG_RESET:
arg_reset = true;
break;
case '?':
return -EINVAL;
@ -1497,6 +1547,10 @@ static int run(int argc, char *argv[]) {
return r;
}
r = process_reset(rfd);
if (r < 0)
return r;
r = process_locale(rfd);
if (r < 0)
return r;

9
test/units/testsuite-74.firstboot.sh
View file

@ -119,6 +119,15 @@ grep -q "^root:x:0:0:.*:/bin/barshell$" "$ROOT/etc/passwd"
grep -q "^root:$ROOT_HASHED_PASSWORD2:" "$ROOT/etc/shadow"
grep -q "hello.world=0" "$ROOT/etc/kernel/cmdline"
# Test that --reset removes all files configured by firstboot.
systemd-firstboot --root="$ROOT" --reset
[[ ! -e "$ROOT/etc/locale.conf" ]]
[[ ! -e "$ROOT/etc/vconsole.conf" ]]
[[ ! -e "$ROOT/etc/localtime" ]]
[[ ! -e "$ROOT/etc/hostname" ]]
[[ ! -e "$ROOT/etc/machine-id" ]]
[[ ! -e "$ROOT/etc/kernel/cmdline" ]]
# --copy-* options
rm -fr "$ROOT"
mkdir "$ROOT"