penguins-eggs 9.6.23 → 9.8.1

package/dist/commands/wardrobe/show.js

@@ -20,6 +20,22 @@ const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
  *
  */
 class Show extends core_1.Command {
+    static flags = {
+        help: core_1.Flags.help({ char: 'h' }),
+        json: core_1.Flags.boolean({ char: 'j', description: 'output JSON' }),
+        verbose: core_1.Flags.boolean({ char: 'v' }),
+        wardrobe: core_1.Flags.string({ char: 'w', description: 'wardrobe' }),
+    };
+    static description = 'show costumes/accessories in wardrobe';
+    static args = {
+        repo: core_1.Args.string({ name: 'costume', description: 'costume to show', required: false }),
+    };
+    //static args = [{ name: 'costume', description: 'costume', required: false }]
+    static example = [
+        'eggs wardrobe show colibri',
+        'eggs wardrobe show accessories/firmwares',
+        'eggs wardrobe show accessories/',
+    ];
     async run() {
         const { args, flags } = await this.parse(Show);
         const verbose = flags.verbose;
@@ -79,17 +95,4 @@ class Show extends core_1.Command {
         }
     }
 }
-Show.flags = {
-    help: core_1.Flags.help({ char: 'h' }),
-    json: core_1.Flags.boolean({ char: 'j', description: 'output JSON' }),
-    verbose: core_1.Flags.boolean({ char: 'v' }),
-    wardrobe: core_1.Flags.string({ char: 'w', description: 'wardrobe' }),
-};
-Show.description = 'show costumes/accessories in wardrobe';
-Show.args = [{ name: 'costume', description: 'costume', required: false }];
-Show.example = [
-    'eggs wardrobe show colibri',
-    'eggs wardrobe show accessories/firmwares',
-    'eggs wardrobe show accessories/',
-];
 exports.default = Show;

package/dist/commands/wardrobe/wear.js

@@ -18,6 +18,22 @@ const tailor_1 = tslib_1.__importDefault(require("../../classes/tailor"));
  *
  */
 class Wear extends core_1.Command {
+    static flags = {
+        help: core_1.Flags.help({ char: 'h' }),
+        no_accessories: core_1.Flags.boolean({ char: 'a', description: 'not install accessories' }),
+        no_firmwares: core_1.Flags.boolean({ char: 'f', description: 'not install firmwares' }),
+        verbose: core_1.Flags.boolean({ char: 'v' }),
+        wardrobe: core_1.Flags.string({ char: 'w', description: 'wardrobe' }),
+    };
+    static description = 'wear costume/accessories from wardrobe';
+    static args = {
+        repo: core_1.Args.string({ name: 'costume', description: 'costume to wear', required: false }),
+    };
+    static examples = [
+        'sudo eggs wardrobe wear duck',
+        'sudo eggs wardrobe wear accessories/firmwares',
+        'sudo eggs wardrobe wear wagtail/waydroid',
+    ];
     async run() {
         const { argv, flags } = await this.parse(Wear);
         const verbose = flags.verbose;
@@ -70,18 +86,4 @@ class Wear extends core_1.Command {
         }
     }
 }
-Wear.flags = {
-    help: core_1.Flags.help({ char: 'h' }),
-    no_accessories: core_1.Flags.boolean({ char: 'a', description: 'not install accessories' }),
-    no_firmwares: core_1.Flags.boolean({ char: 'f', description: 'not install firmwares' }),
-    verbose: core_1.Flags.boolean({ char: 'v' }),
-    wardrobe: core_1.Flags.string({ char: 'w', description: 'wardrobe' }),
-};
-Wear.description = 'wear costume/accessories from wardrobe';
-Wear.args = [{ name: 'costume', description: 'costume', required: false }];
-Wear.examples = [
-    'sudo eggs wardrobe wear duck',
-    'sudo eggs wardrobe wear accessories/firmwares',
-    'sudo eggs wardrobe wear wagtail/waydroid',
-];
 exports.default = Wear;

package/dist/components/summary.js

@@ -14,7 +14,7 @@ const title_1 = tslib_1.__importDefault(require("./elements/title"));
 const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
-function Summary({ name, password, rootPassword, hostname, region, zone, language, keyboardModel, keyboardLayout, installationDevice, message }) {
+function Summary({ name, password, rootPassword, hostname, region, zone, language, keyboardModel, keyboardLayout, installationDevice, filesystemType, message }) {
     let productName = 'unknown';
     let version = 'x.x.x';
     let configRoot = '/etc/penguins-eggs.d/krill/';
@@ -75,7 +75,10 @@ function Summary({ name, password, rootPassword, hostname, region, zone, languag
                             react_1.default.createElement(ink_1.Text, { color: "green" }, keyboardLayout)),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, { bold: true }, "Erase disk "),
-                            react_1.default.createElement(ink_1.Text, { color: "green" }, installationDevice)),
+                            react_1.default.createElement(ink_1.Text, null,
+                                installationDevice,
+                                " formatting: ",
+                                filesystemType)),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, { color: "red" }, message))))))));
 }

package/dist/interfaces/i-analyze.js

@@ -8,15 +8,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * license: MIT
  */
 class IAnalyze {
-    constructor() {
-        this.login = '';
-        this.password = '';
-        this.uid = '';
-        this.gid = '';
-        this.gecos = '';
-        this.home = '';
-        this.shell = '';
-        this.size = 0;
-    }
+    login = '';
+    password = '';
+    uid = '';
+    gid = '';
+    gecos = '';
+    home = '';
+    shell = '';
+    size = 0;
 }
 exports.default = IAnalyze;

package/dist/interfaces/{i-filters.js → i-excludes.js}

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//export interface IFilters { }

package/dist/krill/krill-prepare.js

@@ -67,6 +67,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const systemctl_1 = tslib_1.__importDefault(require("../classes/systemctl"));
 const locales_1 = tslib_1.__importDefault(require("../classes/locales"));
 const keyboards_1 = tslib_1.__importDefault(require("../classes/keyboards"));
+const pacman_1 = tslib_1.__importDefault(require("../classes/pacman"));
 // libraries
 const exec = require('../lib/utils').exec;
 const welcome_1 = tslib_1.__importDefault(require("../components/welcome"));
@@ -104,6 +105,12 @@ const config_file = '/etc/penguins-eggs.d/krill.yaml';
  *
  */
 class Krill {
+    krillConfig = {};
+    locales = new locales_1.default();
+    keyboards = new keyboards_1.default();
+    unattended = false;
+    nointeractive = false;
+    halt = false;
     /**
      * constructor
      * @param unattended
@@ -111,12 +118,6 @@ class Krill {
      * @param halt
      */
     constructor(unattended = false, nointeractive = false, halt = false) {
-        this.krillConfig = {};
-        this.locales = new locales_1.default();
-        this.keyboards = new keyboards_1.default();
-        this.unattended = false;
-        this.nointeractive = false;
-        this.halt = false;
         this.unattended = unattended;
         this.nointeractive = nointeractive;
         this.halt = halt;
@@ -134,7 +135,7 @@ class Krill {
      * @param pve
      * @param verbose
      */
-    async prepare(krillConfig = {}, ip = false, random = false, domain = '', suspend = false, small = false, none = false, cryped = false, pve = false, verbose = false) {
+    async prepare(krillConfig = {}, ip = false, random = false, domain = '', suspend = false, small = false, none = false, cryped = false, pve = false, btrfs = false, verbose = false) {
         /**
          * Check for disk presence
          */
@@ -210,6 +211,9 @@ class Krill {
             filesystemType: this.krillConfig.filesystemType,
             userSwapChoice: this.krillConfig.userSwapChoice
         };
+        if (btrfs) {
+            oPartitions.filesystemType = 'btrfs';
+        }
         if (suspend) {
             oPartitions.userSwapChoice = 'suspend';
         }
@@ -258,7 +262,7 @@ class Krill {
             oLocation = await this.location(oWelcome.language);
             //let kl = oWelcome.language.substring(oWelcome.language.indexOf('_'),2).toLowerCase()
             oKeyboard = await this.keyboard();
-            oPartitions = await this.partitions(cryped, pve);
+            oPartitions = await this.partitions(cryped, pve, btrfs);
             oUsers = await this.users();
             oNetwork = await this.network();
         }
@@ -378,7 +382,7 @@ class Krill {
     /**
     * PARTITIONS
     */
-    async partitions(crypted = false, pve = false) {
+    async partitions(crypted = false, pve = false, btrfs = false) {
         // Calamares won't use any devices with iso9660 filesystem on it.
         const drives = shelljs_1.default.exec('lsblk |grep disk|cut -f 1 "-d "', { silent: true }).stdout.trim().split('\n');
         const driveList = [];
@@ -397,6 +401,9 @@ class Krill {
             installationMode = 'lvm2';
         }
         let filesystemType = 'ext4';
+        if (pacman_1.default.packageIsInstalled("btrfs-progs")) {
+            filesystemType = 'btrfs';
+        }
         let userSwapChoice = 'small';
         let partitionsElem;
         while (true) {
@@ -413,7 +420,12 @@ class Krill {
                 else if (pve) {
                     installationMode = 'lvm2';
                 }
-                filesystemType = '';
+                if (btrfs) {
+                    filesystemType = 'btrfs';
+                }
+                else {
+                    filesystemType = 'ext4';
+                }
                 userSwapChoice = '';
             }
             installationDevice = await (0, select_installation_device_1.default)();
@@ -533,7 +545,7 @@ class Krill {
             message = "Unattended installation will start in 5 seconds, press CTRL-C to abort!";
         }
         while (true) {
-            summaryElem = react_1.default.createElement(summary_1.default, { name: users.name, password: users.password, rootPassword: users.rootPassword, hostname: users.hostname, region: location.region, zone: location.zone, language: location.language, keyboardModel: keyboard.keyboardModel, keyboardLayout: keyboard.keyboardLayout, installationDevice: partitions.installationDevice, message: message });
+            summaryElem = react_1.default.createElement(summary_1.default, { name: users.name, password: users.password, rootPassword: users.rootPassword, hostname: users.hostname, region: location.region, zone: location.zone, language: location.language, keyboardModel: keyboard.keyboardModel, keyboardLayout: keyboard.keyboardLayout, installationDevice: partitions.installationDevice, filesystemType: partitions.filesystemType, message: message });
             if (this.unattended && this.nointeractive) {
                 redraw(summaryElem);
                 await sleep(5000);

package/dist/krill/krill-sequence.js

@@ -48,8 +48,6 @@ const grubcfg_1 = tslib_1.__importDefault(require("./modules/grubcfg"));
 const bootloader_1 = tslib_1.__importDefault(require("./modules/bootloader"));
 const packages_1 = tslib_1.__importDefault(require("./modules/packages"));
 const remove_installer_link_1 = tslib_1.__importDefault(require("./modules/remove-installer-link"));
-// luksbootkeyfile:
-// plymouthcfg;
 const initramfs_cfg_1 = tslib_1.__importDefault(require("./modules/initramfs-cfg"));
 const initramfs_1 = tslib_1.__importDefault(require("./modules/initramfs"));
 const del_live_user_1 = tslib_1.__importDefault(require("./modules/del-live-user"));
@@ -64,80 +62,80 @@ const cfs_1 = tslib_1.__importDefault(require("../classes/cfs"));
  * hatching: installazione o cova!!!
  */
 class Sequence {
+    partition = partition_1.default;
+    // mount
+    mountFs = mount_fs_1.mountFs;
+    mountVfs = mount_vfs_1.mountVfs;
+    //
+    unpackfs = unpackfs_1.default;
+    machineId = machine_id_1.default;
+    fstab = fstab_1.default;
+    locale = locale_1.default;
+    keyboard = m_keyboard_1.default;
+    localeCfg = locale_cfg_1.default;
+    // users
+    addUser = add_user_1.default;
+    changePassword = change_password_1.default;
+    // displaumanager: autologin
+    networkCfg = network_cfg_1.default;
+    // hwclock:
+    // services-systemd:
+    // bootloader-config
+    bootloaderConfig = bootloader_config_1.default;
+    bootloaderConfigArch = bootloader_config_arch_1.default;
+    bootloaderConfigDebian = bootloader_config_debian_1.default;
+    //
+    grubcfg = grubcfg_1.default;
+    bootloader = bootloader_1.default;
+    packages = packages_1.default;
+    removeInstallerLink = remove_installer_link_1.default;
+    // luksbootkeyfile:
+    // plymouthcfg;
+    initramfsCfg = initramfs_cfg_1.default;
+    initramfs = initramfs_1.default;
+    delLiveUser = del_live_user_1.default;
+    umountFs = mount_fs_1.umountFs;
+    umountVfs = mount_vfs_1.umountVfs;
+    // to order in same way
+    timezone = m_timezone_1.default;
+    umount = umount_1.default;
+    mkfs = mkfs_1.default;
+    hostname = hostname_1.default;
+    installer = {};
+    installTarget = '/tmp/calamares-krill-root';
+    verbose = false;
+    echo = {};
+    efi = false;
+    devices = {};
+    users = {};
+    network = {};
+    partitions = {};
+    language = '';
+    region = '';
+    zone = '';
+    keyboardModel = '';
+    keyboardLayout = '';
+    keyboardVariant = '';
+    toNull = ' > /dev/null 2>&1';
+    settings = {};
+    remix = {};
+    distro = {};
+    // Crypted Clone
+    luksName = 'luks-volume';
+    luksFile = ``;
+    luksDevice = `/dev/mapper/${this.luksName}`;
+    luksMountpoint = `/mnt`;
+    // Clone (Uncrypted)
+    is_clone = fs_1.default.existsSync('penguins-eggs.d/is_clone');
+    is_crypted_clone = fs_1.default.existsSync('/etc/penguins-eggs.d/is_crypted_clone');
+    unattended = false;
+    nointeractive = false;
+    halt = false;
+    cliAutologin = new cli_autologin_1.default();
     /**
      * constructor
      */
     constructor(location, keyboard, partitions, users, network) {
-        this.partition = partition_1.default;
-        // mount
-        this.mountFs = mount_fs_1.mountFs;
-        this.mountVfs = mount_vfs_1.mountVfs;
-        //
-        this.unpackfs = unpackfs_1.default;
-        this.machineId = machine_id_1.default;
-        this.fstab = fstab_1.default;
-        this.locale = locale_1.default;
-        this.keyboard = m_keyboard_1.default;
-        this.localeCfg = locale_cfg_1.default;
-        // users
-        this.addUser = add_user_1.default;
-        this.changePassword = change_password_1.default;
-        // displaumanager: autologin
-        this.networkCfg = network_cfg_1.default;
-        // hwclock:
-        // services-systemd:
-        // bootloader-config
-        this.bootloaderConfig = bootloader_config_1.default;
-        this.bootloaderConfigArch = bootloader_config_arch_1.default;
-        this.bootloaderConfigDebian = bootloader_config_debian_1.default;
-        //
-        this.grubcfg = grubcfg_1.default;
-        this.bootloader = bootloader_1.default;
-        this.packages = packages_1.default;
-        this.removeInstallerLink = remove_installer_link_1.default;
-        // luksbootkeyfile:
-        // plymouthcfg;
-        this.initramfsCfg = initramfs_cfg_1.default;
-        this.initramfs = initramfs_1.default;
-        this.delLiveUser = del_live_user_1.default;
-        this.umountFs = mount_fs_1.umountFs;
-        this.umountVfs = mount_vfs_1.umountVfs;
-        // to order in same way
-        this.timezone = m_timezone_1.default;
-        this.umount = umount_1.default;
-        this.mkfs = mkfs_1.default;
-        this.hostname = hostname_1.default;
-        this.installer = {};
-        this.installTarget = '/tmp/calamares-krill-root';
-        this.verbose = false;
-        this.echo = {};
-        this.efi = false;
-        this.devices = {};
-        this.users = {};
-        this.network = {};
-        this.partitions = {};
-        this.language = '';
-        this.region = '';
-        this.zone = '';
-        this.keyboardModel = '';
-        this.keyboardLayout = '';
-        this.keyboardVariant = '';
-        this.toNull = ' > /dev/null 2>&1';
-        this.settings = {};
-        this.remix = {};
-        this.distro = {};
-        // Crypted Clone
-        this.luksName = 'luks-eggs-data';
-        this.luksFile = `/run/live/medium/live/${this.luksName}`;
-        this.luksDevice = `/dev/mapper/${this.luksName}`;
-        this.luksMountpoint = `/mnt`;
-        // Clone (Uncrypted)
-        this.is_clone = fs_1.default.existsSync('/etc/penguins-eggs.d/is_clone');
-        this.is_crypted_clone = fs_1.default.existsSync('/etc/penguins-eggs.d/is_crypted_clone');
-        this.unattended = false;
-        this.nointeractive = false;
-        this.halt = false;
-        this.cliAutologin = new cli_autologin_1.default();
         this.installer = (0, installer_1.installer)();
         this.settings = new settings_1.default();
         this.language = location.language;
@@ -156,6 +154,7 @@ class Sequence {
         this.devices.swap = {};
         this.distro = new distro_1.default(this.remix);
         this.efi = fs_1.default.existsSync('/sys/firmware/efi/efivars');
+        this.luksFile = `${this.distro.liveMediumPath}live/${this.luksName}`;
     }
     /**
      * install
@@ -308,7 +307,7 @@ class Sequence {
                     }
                 }
                 else {
-                    await utils_1.default.pressKeyToExit(`Cannot find LUKS file ${this.luksFile}`);
+                    await utils_1.default.pressKeyToExit(`Cannot find luks-volume file ${this.luksFile}`);
                 }
             }
             // networkcfg

package/dist/krill/modules/fstab.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
 const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const pacman_1 = tslib_1.__importDefault(require("../../classes/pacman"));
 /**
    * fstab()
    * @param devices
@@ -18,11 +19,10 @@ const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
 async function fstab(installDevice, crypted = false) {
     let text = '';
     /**
-       * crypttab
-       */
+    * crypttab
+    */
     if (this.partitions.installationMode === 'full-encrypted') {
         const crypttab = this.installTarget + '/etc/crypttab';
-        text = '';
         text += '# /etc/crypttab: mappings for encrypted partitions.\n';
         text += '#\n';
         text += '# Each mapped device will be created in /dev/mapper, so your /etc/fstab\n';
@@ -42,43 +42,70 @@ async function fstab(installDevice, crypted = false) {
         text += `root_crypted UUID=${utils_1.default.uuid(this.devices.root.cryptedFrom)} none luks,swap\n`;
         utils_1.default.write(crypttab, text);
     }
+    /**
+     * fstab
+     */
+    if (!pacman_1.default.packageIsInstalled('btrfs-progs')) {
+        this.partitions.filesystemType === 'ext4';
+    }
     const fstab = this.installTarget + '/etc/fstab';
     let mountOptsRoot = '';
     let mountOptsBoot = '';
     let mountOptsData = '';
     let mountOptsEfi = '';
     let mountOptsSwap = '';
-    if (await isRotational(installDevice)) {
-        mountOptsRoot = 'defaults,relatime 0 1';
-        mountOptsBoot = 'defaults,relatime 0 1';
-        mountOptsData = 'defaults,relatime 0 1';
-        mountOptsEfi = 'defaults,relatime 0 2';
-        mountOptsSwap = 'defaults,relatime 0 2';
-    }
-    else {
-        mountOptsRoot = 'defaults,noatime 0 1';
-        mountOptsBoot = 'defaults,noatime 0 1';
-        mountOptsData = 'defaults,noatime 0 1';
-        mountOptsEfi = 'defaults,noatime 0 2';
-        mountOptsSwap = 'defaults,noatime 0 2';
-    }
-    text = '';
-    text += `# ${this.devices.root.name} ${this.devices.root.mountPoint} ${this.devices.root.fsType} ${mountOptsRoot}\n`;
-    text += `UUID=${utils_1.default.uuid(this.devices.root.name)} ${this.devices.root.mountPoint} ${this.devices.root.fsType} ${mountOptsRoot}\n`;
-    if (this.devices.boot.name !== 'none') {
-        text += `# ${this.devices.boot.name} ${this.devices.boot.mountPoint} ${this.devices.boot.fsType} ${mountOptsBoot}\n`;
-        text += `UUID=${utils_1.default.uuid(this.devices.boot.name)} ${this.devices.boot.mountPoint} ${this.devices.root.fsType} ${mountOptsBoot}\n`;
-    }
-    if (this.devices.data.name !== 'none') {
-        text += `# ${this.devices.data.name} ${this.devices.data.mountPoint} ${this.devices.data.fsType} ${mountOptsData}\n`;
-        text += `UUID=${utils_1.default.uuid(this.devices.data.name)} ${this.devices.data.mountPoint} ${this.devices.data.fsType} ${mountOptsData}\n`;
+    if (this.partitions.filesystemType === 'ext4') {
+        if (await isRotational(installDevice)) {
+            mountOptsRoot = 'defaults,relatime 0 1';
+            mountOptsBoot = 'defaults,relatime 0 1';
+            mountOptsData = 'defaults,relatime 0 1';
+            mountOptsEfi = 'defaults,relatime 0 2';
+            mountOptsSwap = 'defaults,relatime 0 2';
+        }
+        else {
+            mountOptsRoot = 'defaults,noatime 0 1';
+            mountOptsBoot = 'defaults,noatime 0 1';
+            mountOptsData = 'defaults,noatime 0 1';
+            mountOptsEfi = 'defaults,noatime 0 2';
+            mountOptsSwap = 'defaults,noatime 0 2';
+        }
+        text = '';
+        text += `# ${this.devices.root.name} ${this.devices.root.mountPoint} ${this.devices.root.fsType} ${mountOptsRoot}\n`;
+        text += `UUID=${utils_1.default.uuid(this.devices.root.name)} ${this.devices.root.mountPoint} ${this.devices.root.fsType} ${mountOptsRoot}\n`;
+        if (this.devices.boot.name !== 'none') {
+            text += `# ${this.devices.boot.name} ${this.devices.boot.mountPoint} ${this.devices.boot.fsType} ${mountOptsBoot}\n`;
+            text += `UUID=${utils_1.default.uuid(this.devices.boot.name)} ${this.devices.boot.mountPoint} ${this.devices.root.fsType} ${mountOptsBoot}\n`;
+        }
+        if (this.devices.data.name !== 'none') {
+            text += `# ${this.devices.data.name} ${this.devices.data.mountPoint} ${this.devices.data.fsType} ${mountOptsData}\n`;
+            text += `UUID=${utils_1.default.uuid(this.devices.data.name)} ${this.devices.data.mountPoint} ${this.devices.data.fsType} ${mountOptsData}\n`;
+        }
+        if (this.efi) {
+            text += `# ${this.devices.efi.name} ${this.devices.efi.mountPoint} vfat ${mountOptsEfi}\n`;
+            text += `UUID=${utils_1.default.uuid(this.devices.efi.name)} ${this.devices.efi.mountPoint} vfat ${mountOptsEfi}\n`;
+        }
+        text += `# ${this.devices.swap.name} ${this.devices.swap.mountPoint} ${this.devices.swap.fsType} ${mountOptsSwap}\n`;
+        text += `UUID=${utils_1.default.uuid(this.devices.swap.name)} ${this.devices.swap.mountPoint} ${this.devices.swap.fsType} ${mountOptsSwap}\n`;
     }
-    if (this.efi) {
-        text += `# ${this.devices.efi.name} ${this.devices.efi.mountPoint} vfat ${mountOptsEfi}\n`;
-        text += `UUID=${utils_1.default.uuid(this.devices.efi.name)} ${this.devices.efi.mountPoint} vfat ${mountOptsEfi}\n`;
+    else if (this.partitions.filesystemType === 'btrfs') {
+        let base = '/        btrfs  subvol=/@,defaults 0 0';
+        let snapshots = '/.snapshots               btrfs  subvol=/@snapshots,defaults 0 0';
+        let home = '/home                     btrfs  subvol=/@home,defaults 0 0';
+        let root = '/root                     btrfs  subvol=/@root,defaults 0 0';
+        let var_log = '/var/log                  btrfs  subvol=/@var@log,defaults 0 0';
+        let var_lib_AccountsService = '/var/lib/AccountsService  btrfs  subvol=/@var@lib@AccountsService,defaults 0 0';
+        let var_lib_blueman = '/var/lib/blueman          btrfs  subvol=/@var@lib@blueman,defaults 0 0';
+        let tmp = '/tmp                      btrfs  subvol=/@tmp,defaults 0 0';
+        text += `# ${this.devices.root.name}  btrfs ${this.devices.root.mountPoint} subvol\n`;
+        text += `UUID=${utils_1.default.uuid(this.devices.root.name)} ${base}\n`;
+        text += `# UUID=${utils_1.default.uuid(this.devices.root.name)} ${snapshots}\n`;
+        text += `# UUID=${utils_1.default.uuid(this.devices.root.name)} ${home}\n`;
+        text += `# UUID=${utils_1.default.uuid(this.devices.root.name)} ${root}\n`;
+        text += `# UUID=${utils_1.default.uuid(this.devices.root.name)} ${var_log}\n`;
+        text += `# UUID=${utils_1.default.uuid(this.devices.root.name)} ${var_lib_AccountsService}\n`;
+        text += `# UUID=${utils_1.default.uuid(this.devices.root.name)} ${var_lib_blueman}\n`;
+        text += `# UUID=${utils_1.default.uuid(this.devices.root.name)} ${tmp}\n`;
     }
-    text += `# ${this.devices.swap.name} ${this.devices.swap.mountPoint} ${this.devices.swap.fsType} ${mountOptsSwap}\n`;
-    text += `UUID=${utils_1.default.uuid(this.devices.swap.name)} ${this.devices.swap.mountPoint} ${this.devices.swap.fsType} ${mountOptsSwap}\n`;
     utils_1.default.write(fstab, text);
 }
 exports.default = fstab;

package/dist/krill/modules/mkfs.js

@@ -14,24 +14,37 @@ const utils_1 = require("../../lib/utils");
 */
 async function mkfs() {
     const result = true;
-    if (this.efi) {
-        await (0, utils_1.exec)(`mkdosfs -F 32 -I ${this.devices.efi.name} ${this.toNull}`, this.echo);
-    }
-    if (this.devices.boot.name !== 'none') {
-        if (this.devices.boot.fsType === undefined) {
-            this.devices.boot.fsType = 'ext2';
-            this.devices.boot.mountPoint = '/boot';
+    if (this.partitions.filesystemType === 'ext4') {
+        if (this.efi) {
+            await (0, utils_1.exec)(`mkdosfs -F 32 -I ${this.devices.efi.name} ${this.toNull}`, this.echo);
+        }
+        if (this.devices.boot.name !== 'none') {
+            if (this.devices.boot.fsType === undefined) {
+                this.devices.boot.fsType = 'ext2';
+                this.devices.boot.mountPoint = '/boot';
+            }
+            await (0, utils_1.exec)(`mke2fs -Ft ${this.devices.boot.fsType} ${this.devices.boot.name} ${this.toNull}`, this.echo);
+        }
+        if (this.devices.root.name !== 'none') {
+            await (0, utils_1.exec)(`mke2fs -Ft ${this.devices.root.fsType} ${this.devices.root.name} ${this.toNull}`, this.echo);
+        }
+        if (this.devices.data.name !== 'none') {
+            await (0, utils_1.exec)(`mke2fs -Ft ${this.devices.data.fsType} ${this.devices.data.name} ${this.toNull}`, this.echo);
+        }
+        if (this.devices.swap.name !== 'none') {
+            await (0, utils_1.exec)(`mkswap ${this.devices.swap.name} ${this.toNull}`, this.echo);
         }
-        await (0, utils_1.exec)(`mke2fs -Ft ${this.devices.boot.fsType} ${this.devices.boot.name} ${this.toNull}`, this.echo);
-    }
-    if (this.devices.root.name !== 'none') {
-        await (0, utils_1.exec)(`mke2fs -Ft ${this.devices.root.fsType} ${this.devices.root.name} ${this.toNull}`, this.echo);
-    }
-    if (this.devices.data.name !== 'none') {
-        await (0, utils_1.exec)(`mke2fs -Ft ${this.devices.data.fsType} ${this.devices.data.name} ${this.toNull}`, this.echo);
     }
-    if (this.devices.swap.name !== 'none') {
-        await (0, utils_1.exec)(`mkswap ${this.devices.swap.name} ${this.toNull}`, this.echo);
+    else if (this.partitions.filesystemType === 'btrfs') {
+        await (0, utils_1.exec)(`mkfs.btrfs -f ${this.devices.root.name} ${this.toNull}`, this.echo);
+        //  create subvolumes
+        // await exec(`btrfs subvolume create /.snapshots ${this.toNull}`, this.echo)
+        // await exec(`btrfs subvolume create /home ${this.toNull}`, this.echo)
+        // await exec(`btrfs subvolume create /root ${this.toNull}`, this.echo)
+        // await exec(`btrfs subvolume create /var/log ${this.toNull}`, this.echo)
+        // await exec(`btrfs subvolume create /var/lib/AccountsService ${this.toNull}`, this.echo)
+        // await exec(`btrfs subvolume create /var/lib/blueman ${this.toNull}`, this.echo)
+        // await exec(`btrfs subvolume create /tmp ${this.toNull}`, this.echo)
     }
     return result;
 }