diff --git a/.github/pull.yml b/.github/pull.yml index a7f83ff74a..41f7304116 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -4,9 +4,9 @@ rules: # Array of rules upstream: ublue-os:template # Required. Must be in the same fork network. mergeMethod: hardreset # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. mergeUnstable: false - - base: live - upstream: template - mergeMethod: merge + - base: live # Required. Target branch + upstream: template # Required. Must be in the same fork network. + mergeMethod: merge # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. mergeUnstable: false label: ":arrow_heading_down: pull" -conflictLabel: "merge-conflict" +conflictLabel: "merge-conflict" \ No newline at end of file diff --git a/boot_menu.yml b/boot_menu.yml index f876897db3..ff36b5a76b 100644 --- a/boot_menu.yml +++ b/boot_menu.yml @@ -1,5 +1,5 @@ ublue_variants: - label: alextrical/makerspace-kinoite - ks: /kickstart/makerspace-kinoite.ks + ks: /kickstart/ublue-os.ks flavors: - label: makerspace-kinoite \ No newline at end of file diff --git a/kickstart/makerspace-kinoite.ks b/kickstart/makerspace-kinoite.ks deleted file mode 100644 index 77e59d6383..0000000000 --- a/kickstart/makerspace-kinoite.ks +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Anaconda 39.32.6 -# Generated by pykickstart v3.48 -# version=DEVEL -# Use graphical install -graphical - - -# # Package Selection -# %packages -# %end - -# %pre --log=/var/log/kickstart_pre.log -# nmcli dev wifi connect password -# %end - -%post --erroronfail -cp /etc/skel/.bash* /root -%end - -# Keyboard layouts -keyboard --vckeymap=gb --xlayouts='gb' -# System language -lang en_GB.UTF-8 - -# Firewall configuration -firewall --use-system-defaults - -# OSTree setup -ostreesetup --osname="fedora" --remote="fedora" --url="file:///ostree/repo" --ref="fedora/39/x86_64/kinoite" --nogpg - -# Reboot system after install -reboot --kexec - -# System timezone -timezone Europe/London --utc - -# Root password -rootpw --iscrypted $y$j9T$kFcFJPk.ERYNjcScMIBdoU.g$u2ljPOL4aOP0pJk2YQQ0Go/WxwITM5MK1Bjql2ahWj9