From: Daan De Meyer Date: Tue, 1 Aug 2023 13:10:24 +0000 (+0200) Subject: Revert "repart: Add --oem and OEM=" X-Git-Tag: v255-rc1~851^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e81a84448b97bc607c42a4567287792f64a8dbf;p=thirdparty%2Fsystemd.git Revert "repart: Add --oem and OEM=" This reverts commit 47c7805579bd54f2c149c80b22caed6f71ea01a7. --- diff --git a/man/repart.d.xml b/man/repart.d.xml index 7e4fe93cfcb..752fc3b852f 100644 --- a/man/repart.d.xml +++ b/man/repart.d.xml @@ -567,15 +567,6 @@ into their original state by removing partitions and creating them anew. Defaults to off. - - OEM= - - Takes a boolean argument. If specified the partition is marked as an OEM partition. - When the is used, only OEM partitions are written to the partition table. - Unless configured explicitly with OEM=, a partition is an OEM partition if - FactoryReset=no. - - Flags= diff --git a/man/systemd-repart.xml b/man/systemd-repart.xml index 39912052a4b..1799961527d 100644 --- a/man/systemd-repart.xml +++ b/man/systemd-repart.xml @@ -440,14 +440,6 @@ due to missing permissions. - - BOOL - - Instructs systemd-repart to only include OEM partitions into the - image. Takes a boolean and is off by default. OEM partitions can be configured using the - OEM= setting. - - diff --git a/src/partition/repart.c b/src/partition/repart.c index 9ae8ed4c117..74e04b65abd 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -24,7 +24,6 @@ #include "conf-files.h" #include "conf-parser.h" #include "constants.h" -#include "creds-util.h" #include "cryptsetup-util.h" #include "device-util.h" #include "devnum-util.h" @@ -154,7 +153,6 @@ static uint64_t arg_sector_size = 0; static ImagePolicy *arg_image_policy = NULL; static Architecture arg_architecture = _ARCHITECTURE_INVALID; static int arg_offline = -1; -static bool arg_oem = false; STATIC_DESTRUCTOR_REGISTER(arg_root, freep); STATIC_DESTRUCTOR_REGISTER(arg_image, freep); @@ -207,7 +205,6 @@ typedef struct Partition { bool dropped; bool factory_reset; - int oem; int32_t priority; uint32_t weight, padding_weight; @@ -353,7 +350,6 @@ static Partition *partition_new(void) { .no_auto = -1, .read_only = -1, .growfs = -1, - .oem = -1, }; return p; @@ -427,16 +423,9 @@ static void partition_foreignize(Partition *p) { p->verity = VERITY_OFF; } -static bool partition_is_oem(const Partition *p) { - return p->oem > 0 || (p->oem < 0 && !p->factory_reset); -} - static bool partition_exclude(const Partition *p) { assert(p); - if (arg_oem && !partition_is_oem(p)) - return true; - if (arg_filter_partitions_type == FILTER_PARTITIONS_NONE) return false; @@ -1642,7 +1631,6 @@ static int partition_read_definition(Partition *p, const char *path, const char { "Partition", "GrowFileSystem", config_parse_tristate, 0, &p->growfs }, { "Partition", "SplitName", config_parse_string, 0, &p->split_name_format }, { "Partition", "Minimize", config_parse_minimize, 0, &p->minimize }, - { "Partition", "OEM", config_parse_tristate, 0, &p->oem }, {} }; int r; @@ -6016,7 +6004,6 @@ static int help(void) { " --sector-size=SIZE Set the logical sector size for the image\n" " --architecture=ARCH Set the generic architecture for the image\n" " --offline=BOOL Whether to build the image offline\n" - " --oem=BOOL Whether to only include OEM partitions\n" "\nSee the %s for details.\n", program_invocation_short_name, ansi_highlight(), @@ -6026,17 +6013,6 @@ static int help(void) { return 0; } -static int parse_credentials(void) { - int r; - - r = read_credential_bool("repart.oem"); - if (r < 0) - return log_error_errno(r, "Failed to read repart.oem credential: %m"); - arg_oem = r; - - return 0; -} - static int parse_argv(int argc, char *argv[]) { enum { @@ -6071,7 +6047,6 @@ static int parse_argv(int argc, char *argv[]) { ARG_SKIP_PARTITIONS, ARG_ARCHITECTURE, ARG_OFFLINE, - ARG_OEM, }; static const struct option options[] = { @@ -6106,7 +6081,6 @@ static int parse_argv(int argc, char *argv[]) { { "sector-size", required_argument, NULL, ARG_SECTOR_SIZE }, { "architecture", required_argument, NULL, ARG_ARCHITECTURE }, { "offline", required_argument, NULL, ARG_OFFLINE }, - { "oem", required_argument, NULL, ARG_OEM }, {} }; @@ -6428,13 +6402,6 @@ static int parse_argv(int argc, char *argv[]) { break; - case ARG_OEM: - r = parse_boolean_argument("--oem=", optarg, &arg_oem); - if (r < 0) - return r; - - break; - case '?': return -EINVAL; @@ -6931,10 +6898,6 @@ static int run(int argc, char *argv[]) { log_parse_environment(); log_open(); - r = parse_credentials(); - if (r < 0) - return r; - r = parse_argv(argc, argv); if (r <= 0) return r; diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh index f90c3b1b4ef..fbfc9e7b3aa 100755 --- a/test/units/testsuite-58.sh +++ b/test/units/testsuite-58.sh @@ -132,9 +132,6 @@ EOF Type=home Label=home-first Label=home-always-too-long-xxxxxxxxxxxxxx-%v -# Test that OEM=yes makes sure that a partition is OEM even if FactoryReset=yes is set. -FactoryReset=yes -OEM=yes EOF tee "$defs/swap.conf" <