Cleanup busybox & fix systemd (#6)

This commit is contained in:
Pascal Vizeli 2018-04-28 00:35:26 +02:00 committed by GitHub
parent e544c14d3d
commit 34f58015b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 17 deletions

View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Busybox version: 1.27.2 # Busybox version: 1.27.2
# Tue Apr 17 18:57:21 2018 # Fri Apr 27 16:47:10 2018
# #
CONFIG_HAVE_DOT_CONFIG=y CONFIG_HAVE_DOT_CONFIG=y
@ -606,13 +606,13 @@ CONFIG_GETOPT=y
CONFIG_FEATURE_GETOPT_LONG=y CONFIG_FEATURE_GETOPT_LONG=y
CONFIG_HEXDUMP=y CONFIG_HEXDUMP=y
CONFIG_FEATURE_HEXDUMP_REVERSE=y CONFIG_FEATURE_HEXDUMP_REVERSE=y
CONFIG_HD=y # CONFIG_HD is not set
CONFIG_XXD=y # CONFIG_XXD is not set
CONFIG_HWCLOCK=y # CONFIG_HWCLOCK is not set
CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
CONFIG_IONICE=y CONFIG_IONICE=y
CONFIG_IPCRM=y # CONFIG_IPCRM is not set
CONFIG_IPCS=y CONFIG_IPCS=y
# CONFIG_LAST is not set # CONFIG_LAST is not set
# CONFIG_FEATURE_LAST_FANCY is not set # CONFIG_FEATURE_LAST_FANCY is not set
@ -648,9 +648,9 @@ CONFIG_FEATURE_MOUNT_FLAGS=y
# CONFIG_FEATURE_MOUNT_FSTAB is not set # CONFIG_FEATURE_MOUNT_FSTAB is not set
# CONFIG_FEATURE_MOUNT_OTHERTAB is not set # CONFIG_FEATURE_MOUNT_OTHERTAB is not set
# CONFIG_MOUNTPOINT is not set # CONFIG_MOUNTPOINT is not set
CONFIG_NSENTER=y # CONFIG_NSENTER is not set
CONFIG_FEATURE_NSENTER_LONG_OPTS=y # CONFIG_FEATURE_NSENTER_LONG_OPTS is not set
CONFIG_PIVOT_ROOT=y # CONFIG_PIVOT_ROOT is not set
CONFIG_RDATE=y CONFIG_RDATE=y
CONFIG_RDEV=y CONFIG_RDEV=y
CONFIG_READPROFILE=y CONFIG_READPROFILE=y
@ -674,14 +674,14 @@ CONFIG_FEATURE_TASKSET_FANCY=y
CONFIG_UEVENT=y CONFIG_UEVENT=y
CONFIG_UMOUNT=y CONFIG_UMOUNT=y
CONFIG_FEATURE_UMOUNT_ALL=y CONFIG_FEATURE_UMOUNT_ALL=y
CONFIG_UNSHARE=y # CONFIG_UNSHARE is not set
# CONFIG_WALL is not set # CONFIG_WALL is not set
# #
# Common options for mount/umount # Common options for mount/umount
# #
CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP=y
CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
# CONFIG_FEATURE_MTAB_SUPPORT is not set # CONFIG_FEATURE_MTAB_SUPPORT is not set
CONFIG_VOLUMEID=y CONFIG_VOLUMEID=y
@ -750,10 +750,10 @@ CONFIG_FEATURE_CROND_DIR=""
# CONFIG_FLASHCP is not set # CONFIG_FLASHCP is not set
CONFIG_HDPARM=y CONFIG_HDPARM=y
CONFIG_FEATURE_HDPARM_GET_IDENTITY=y CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y # CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
# CONFIG_I2CGET is not set # CONFIG_I2CGET is not set
# CONFIG_I2CSET is not set # CONFIG_I2CSET is not set
@ -780,7 +780,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0
# CONFIG_MT is not set # CONFIG_MT is not set
CONFIG_NANDWRITE=y CONFIG_NANDWRITE=y
CONFIG_NANDDUMP=y CONFIG_NANDDUMP=y
CONFIG_PARTPROBE=y # CONFIG_PARTPROBE is not set
# CONFIG_RAIDAUTORUN is not set # CONFIG_RAIDAUTORUN is not set
# CONFIG_READAHEAD is not set # CONFIG_READAHEAD is not set
# CONFIG_RFKILL is not set # CONFIG_RFKILL is not set
@ -1069,7 +1069,7 @@ CONFIG_ASH_TEST=y
CONFIG_ASH_HELP=y CONFIG_ASH_HELP=y
CONFIG_ASH_GETOPTS=y CONFIG_ASH_GETOPTS=y
CONFIG_ASH_CMDCMD=y CONFIG_ASH_CMDCMD=y
CONFIG_CTTYHACK=y # CONFIG_CTTYHACK is not set
# CONFIG_HUSH is not set # CONFIG_HUSH is not set
# CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BASH_COMPAT is not set
# CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_BRACE_EXPANSION is not set

View File

@ -0,0 +1,41 @@
From 525b60af3320de3cc1f1145fe31a2de07b61faf6 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Sat, 28 Apr 2018 00:20:08 +0200
Subject: [PATCH 1/1] Allow hostname on ro
---
src/hostname/hostnamed.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index d9ad2fb..87fae35 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -289,6 +289,7 @@ static int context_update_kernel_hostname(Context *c) {
static int context_write_data_static_hostname(Context *c) {
assert(c);
+ FILE *f = NULL;
if (isempty(c->data[PROP_STATIC_HOSTNAME])) {
@@ -297,7 +298,15 @@ static int context_write_data_static_hostname(Context *c) {
return 0;
}
- return write_string_file_atomic_label("/etc/hostname", c->data[PROP_STATIC_HOSTNAME]);
+
+ f = fopen("/etc/hostname", "w");
+ if (f == NULL)
+ return -ENOENT;
+
+ fputs(c->data[PROP_STATIC_HOSTNAME], f);
+ fclose(f);
+
+ return 0;
}
static int context_write_data_machine_info(Context *c) {
--
2.7.4