diff --git a/Makefile b/Makefile index 0b0ebd781b..d0edc86953 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,10 @@ TARGET_DIR = $(BUILD_DIR)/$(TARGET)/$(BUILD_TYPE) BUILD_FLAGS += --target-dir $(BUILD_DIR) INITFS_BINS = init logd ramfs randd zerod \ - acpid fbbootlogd fbcond hwd inputd lived \ + acpid fbbootlogd hwd inputd lived \ pcid pcid-spawner rtcd vesad INITFS_DRIVERS_BINS = nvmed virtio-blkd virtio-gpud -BASE_BINS = inputd pcid pcid-spawner redoxerd audiod dhcpd ipcd ptyd netstack +BASE_BINS = fbcond inputd pcid pcid-spawner redoxerd audiod dhcpd ipcd ptyd netstack DRIVERS_BINS = e1000d ihdad ihdgd ixgbed rtl8139d rtl8168d \ usbctl usbhidd usbhubd usbscsid virtio-netd xhcid diff --git a/init.d/00_base.target b/init.d/00_base.target index 03c2579825..51497d1ace 100644 --- a/init.d/00_base.target +++ b/init.d/00_base.target @@ -5,4 +5,5 @@ requires_weak = [ "00_ipcd.service", "00_ptyd.service", "00_pcid-spawner.service", + "00_fbcond.service" ] diff --git a/init.initfs.d/20_fbcond.service b/init.d/00_fbcond.service similarity index 66% rename from init.initfs.d/20_fbcond.service rename to init.d/00_fbcond.service index 8db3dfdbeb..3d5151f8ac 100644 --- a/init.initfs.d/20_fbcond.service +++ b/init.d/00_fbcond.service @@ -1,6 +1,5 @@ [unit] description = "Framebuffer text console" -requires_weak = ["10_inputd.service", "20_vesad.service"] [service] cmd = "fbcond"