diff --git a/config/redbear-device-services.toml b/config/redbear-device-services.toml index bd7340bf..c9d2002a 100644 --- a/config/redbear-device-services.toml +++ b/config/redbear-device-services.toml @@ -80,6 +80,6 @@ requires_weak = [ [service] cmd = "fatd" -args = ["disk/live-virtio", "fat-live"] -type = { scheme = "fat-live" } +args = ["disk/live-nvme", "fat-live"] +type = "oneshot_async" """ diff --git a/config/redbear-kde.toml b/config/redbear-kde.toml index 35f2a1cd..9196baff 100644 --- a/config/redbear-kde.toml +++ b/config/redbear-kde.toml @@ -170,7 +170,7 @@ requires_weak = [ cmd = "ion" args = [ "-c", - "sleep 5; redbear-sessiond", + "redbear-sessiond", ] type = "oneshot_async" """ @@ -188,7 +188,7 @@ requires_weak = [ cmd = "ion" args = [ "-c", - "sleep 5; redbear-upower", + "redbear-upower", ] type = "oneshot_async" """ @@ -206,7 +206,7 @@ requires_weak = [ cmd = "ion" args = [ "-c", - "sleep 5; redbear-udisks", + "redbear-udisks", ] type = "oneshot_async" """ @@ -224,7 +224,7 @@ requires_weak = [ cmd = "ion" args = [ "-c", - "sleep 5; redbear-polkit", + "redbear-polkit", ] type = "oneshot_async" """ diff --git a/config/redbear-legacy-base.toml b/config/redbear-legacy-base.toml index e75d147f..c46eda7e 100644 --- a/config/redbear-legacy-base.toml +++ b/config/redbear-legacy-base.toml @@ -11,3 +11,15 @@ data = "" [[files]] path = "/usr/lib/init.d/10_net" data = "" + +[[files]] +path = "/etc/init.d/20_audiod.service" +data = """ +[unit] +description = "Audio multiplexer" +default_dependencies = false + +[service] +cmd = "audiod" +type = "oneshot_async" +""" diff --git a/config/redbear-live-mini.toml b/config/redbear-live-mini.toml new file mode 100644 index 00000000..99732567 --- /dev/null +++ b/config/redbear-live-mini.toml @@ -0,0 +1,14 @@ +# Red Bear OS Mini Live Configuration +# Minimal boot-test live ISO variant. +# +# Build: make live CONFIG_NAME=redbear-live-mini + +include = ["minimal.toml", "redbear-legacy-base.toml"] + +[general] +# Keep this image tiny for boot smoke tests only. +filesystem_size = 256 + +[packages] +mc = {} +redbear-info = {} diff --git a/config/redbear-live.toml b/config/redbear-live.toml index a63a0894..3cdff54f 100644 --- a/config/redbear-live.toml +++ b/config/redbear-live.toml @@ -6,10 +6,13 @@ include = ["redbear-desktop.toml"] [general] -# Larger filesystem for live image with more tools -filesystem_size = 12288 +# Keep the live installer image reasonably sized +filesystem_size = 3072 [packages] +# Keep the live installer image compact for now. +redbear-firmware = "ignore" + # Keep these explicit for the live profile even though cub is inherited via redbear-desktop. cub = {} redbear-meta = {} diff --git a/config/redbear-netctl.toml b/config/redbear-netctl.toml index 2152e895..b50a0613 100644 --- a/config/redbear-netctl.toml +++ b/config/redbear-netctl.toml @@ -102,5 +102,5 @@ requires_weak = [ [service] cmd = "redbear-netctl" args = ["--boot"] -type = "oneshot" +type = "oneshot_async" """