penguins-eggs 9.0.16 → 9.0.35

package/lib/classes/incubation/fisherman-helper/packages.js

@@ -60,7 +60,7 @@ function tryInstall(distro) {
     // Pacchetti da installare sempre
     text += `    - hunspell-${lang}\n`;
     // Pacchetti da installare a seconda della distribuzione
-    if (distro.versionLike === 'focal' || distro.versionLike === 'bionic') {
+    if (distro.codenameLikeId === 'focal' || distro.codenameLikeId === 'bionic') {
         text += `    - language-pack-${lang}\n`;
     }
     // Pacchetti da installare se sono presenti

package/lib/classes/incubation/incubator.js

@@ -48,7 +48,7 @@ class Incubator {
         const echo = utils_1.default.setEcho(verbose);
         this.createInstallerDirs();
         // DEBIAN
-        switch (this.distro.versionLike) {
+        switch (this.distro.codenameLikeId) {
             case 'jessie': {
                 const jessie = new jessie_1.Jessie(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
                 await jessie.create();
@@ -59,6 +59,11 @@ class Incubator {
                 await stretch.create();
                 break;
             }
+            case 'buster': {
+                const buster = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await buster.create();
+                break;
+            }
             case 'bullseye': {
                 const bullseye = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
                 await bullseye.create();

package/lib/classes/incubation/installer.d.ts

@@ -6,7 +6,7 @@
  * modules = configuration + 'modules/'
  * modulesMultiarch = '/usr/lib/' + arch-linux-gnu + '/' + installer + '/'
  *
- * template = '/etc/penguins-eggs/' + .distro.versionLike + '/' + installer + '/'
+ * template = '/etc/penguins-eggs/' + .distro.codenameLikeId + '/' + installer + '/'
  * templateModules = template + '/modules/'
  * templateMultiarch = template + installer + '-modules/'
  *

package/lib/classes/incubation/installer.js

@@ -24,12 +24,12 @@ function installer() {
     const remix = {};
     const distro = new distro_1.default(remix);
     if (distro.isCalamaresAvailable) {
-        installer.template = '/etc/penguins-eggs.d/distros/' + distro.versionLike + '/calamares/';
+        installer.template = '/etc/penguins-eggs.d/distros/' + distro.codenameLikeId + '/calamares/';
         installer.templateModules = installer.template + 'modules/';
         installer.templateMultiarch = installer.template + 'calamares-modules/';
     }
     else {
-        installer.template = '/etc/penguins-eggs.d/distros/' + distro.versionLike + '/krill/';
+        installer.template = '/etc/penguins-eggs.d/distros/' + distro.codenameLikeId + '/krill/';
         installer.templateModules = installer.template + 'modules/';
         installer.templateMultiarch = installer.template + 'krill-modules/';
     }

package/lib/classes/krill_install.d.ts

@@ -1,38 +1,40 @@
 /**
- * penguins-eggs: hatching.js
+ * penguins-eggs: krill_install
  *
  * author: Piero Proietti
  * mail: piero.proietti@gmail.com
  *
  */
 /**
- * Ideally, I want to respect this schema
-      - partition
-      - mount
-      - unpackfs
-      - sources-yolk
-      - machineid // to do
-      - fstab
+ * Ideally, I want to respect calamares way, remplementing the same (SEMPLIFIED) steps for CLI
+ *
+      - partition OK
+      - mount this.mountFs, this.mountVfs OK
+      - unpackfs OK
+      - Restore private data from backup
+      - sources-yolk // call execCalamaresModule('sources-yolk')
+      - machineid OK
+      - fstab OK
       - locale // to do
-      - keyboard
+      - keyboard // this.setKeyboard OK
       - localecfg // to do
-      - users // rivedere
-      - displaymanager // autologin
-      - networkcfg
+      - users OK
+      - displaymanager // this.autologin OK
+      - networkcfg OK
       - hwclock // to do
       - services-systemd // to do
-      - bootloader-config // compatible calamares-module bootloader-config
-      - grubcfg //
-      - bootloader // compatible calamares-module calamares-modules grubInstall
+      - bootloader-config // call execCalamaresModule('bootloader-config')
+      - grubcfg OK
+      - bootloader OK
       - packages // to do
       - luksbootkeyfile // to do
       - plymouthcfg // to do
       - initramfscfg OK
       - initramfs OK
-      - removeuser
+      - removeuser OK
       - remove-link // OK
-      - sources-yolk-unmount // compatible calamares-modules sources-yolk-unmount
-      - umount
+      - sources-yolk-unmount // execCalamaresModule('sources-yolk-unmount')
+      - umount // this.umountVfs, this.umountFs
  */
 import { IRemix, IDistro, INet } from '../interfaces';
 import Settings from './settings';
@@ -45,6 +47,7 @@ export default class Hatching {
     installer: IInstaller;
     installTarget: string;
     verbose: boolean;
+    echo: {};
     efi: boolean;
     devices: IDevices;
     users: IUsers;
@@ -151,27 +154,40 @@ export default class Hatching {
      * mkfs
      */
     private mkfs;
+    /**
+     *
+     * @param device
+     */
+    ifMountedDismount(device?: string): Promise<void>;
     /**
      * mount
      */
-    private mount;
+    private mountFs;
     /**
-     * umount
+     * umountFs
      */
-    private umount;
+    private umountFs;
     /**
     * mountvfs()
     */
-    private mountvfs;
+    private mountVfs;
     /**
+     *
      */
-    private umountvfs;
+    private umountVfs;
+    /**
+     *
+     * @param mountpoint
+     */
+    private umount;
     /**
      *
-     * @param p
-     * @returns
      */
     private partition;
+    /**
+     * Return lvmPartname, lvmSwapSize, lvmRootSize
+     */
+    private lvmPartInfo;
     /**
      * isRotational
      * @param device
@@ -187,8 +203,22 @@ export default class Hatching {
      *
      */
     bootloaderConfigUbuntu(): Promise<void>;
+    /**
+     * grubcfg
+     * - open /etc/default/grub
+     * - find GRUB_CMDLINE_LINUX_DEFAULT=
+     * - replace with GRUB_CMDLINE_LINUX_DEFAULT=
+     * 's/GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT=/g'
+     */
+    grubcfg(): void;
+    /**
+     * On Ubuntu
+     * /etc/machine-id must exist to be re-created
+     * https://unix.stackexchange.com/questions/402999/is-it-ok-to-change-etc-machine-id
+     */
+    machineId(): Promise<void>;
     /**
      * only show the result
      */
-    finished(): void;
+    finished(): Promise<void>;
 }