Add mkosi-reinstall

diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py
index 8dbd3302031565250a78812a912fe2e4e704d3bd..feb9a24e05ac5953ed8b2ca4b2ffabffd05b274d 100644 (file)
--- a/mkosi/installer/apt.py
+++ b/mkosi/installer/apt.py
@@ -62,9 +62,10 @@ class Apt(PackageManager):
                 "apt-sortpkgs",
             )
         } | {
-            "mkosi-install": apivfs_cmd(context.root) + cls.cmd(context, "get") + ["install"],
-            "mkosi-upgrade": apivfs_cmd(context.root) + cls.cmd(context, "get") + ["upgrade"],
-            "mkosi-remove" : apivfs_cmd(context.root) + cls.cmd(context, "get") + ["purge"],
+            "mkosi-install"  : apivfs_cmd(context.root) + cls.cmd(context, "get") + ["install"],
+            "mkosi-upgrade"  : apivfs_cmd(context.root) + cls.cmd(context, "get") + ["upgrade"],
+            "mkosi-remove"   : apivfs_cmd(context.root) + cls.cmd(context, "get") + ["purge"],
+            "mkosi-reinstall": apivfs_cmd(context.root) + cls.cmd(context, "get") + ["install", "--reinstall"],
         }
 
     @classmethod

diff --git a/mkosi/installer/dnf.py b/mkosi/installer/dnf.py
index 910e480a0700512f0fc71f1bc336703dd1769833..9058111aaa60d1092957540d70548ea1059db8fd 100644 (file)
--- a/mkosi/installer/dnf.py
+++ b/mkosi/installer/dnf.py
@@ -41,9 +41,10 @@ class Dnf(PackageManager):
         return {
             "dnf": apivfs_cmd(context.root) + cls.cmd(context),
             "rpm": apivfs_cmd(context.root) + rpm_cmd(context),
-            "mkosi-install": apivfs_cmd(context.root) + cls.cmd(context) + ["install"],
-            "mkosi-upgrade": apivfs_cmd(context.root) + cls.cmd(context) + ["upgrade"],
-            "mkosi-remove" : apivfs_cmd(context.root) + cls.cmd(context) + ["remove"],
+            "mkosi-install"  : apivfs_cmd(context.root) + cls.cmd(context) + ["install"],
+            "mkosi-upgrade"  : apivfs_cmd(context.root) + cls.cmd(context) + ["upgrade"],
+            "mkosi-remove"   : apivfs_cmd(context.root) + cls.cmd(context) + ["remove"],
+            "mkosi-reinstall": apivfs_cmd(context.root) + cls.cmd(context) + ["reinstall"],
         }
 
     @classmethod

diff --git a/mkosi/installer/pacman.py b/mkosi/installer/pacman.py
index 7df0fbbf9a137b3279ca01a94235b1e797fbe001..dbdad5d95c679818a4ca57f0900321039a160e0a 100644 (file)
--- a/mkosi/installer/pacman.py
+++ b/mkosi/installer/pacman.py
@@ -37,9 +37,10 @@ class Pacman(PackageManager):
     def scripts(cls, context: Context) -> dict[str, list[PathString]]:
         return {
             "pacman": apivfs_cmd(context.root) + cls.cmd(context),
-            "mkosi-install": apivfs_cmd(context.root) + cls.cmd(context) + ["--sync", "--needed"],
-            "mkosi-upgrade": apivfs_cmd(context.root) + cls.cmd(context) + ["--sync", "--sysupgrade", "--needed"],
-            "mkosi-remove" : apivfs_cmd(context.root) + cls.cmd(context) + ["--remove", "--recursive", "--nosave"],
+            "mkosi-install"  : apivfs_cmd(context.root) + cls.cmd(context) + ["--sync", "--needed"],
+            "mkosi-upgrade"  : apivfs_cmd(context.root) + cls.cmd(context) + ["--sync", "--sysupgrade", "--needed"],
+            "mkosi-remove"   : apivfs_cmd(context.root) + cls.cmd(context) + ["--remove", "--recursive", "--nosave"],
+            "mkosi-reinstall": apivfs_cmd(context.root) + cls.cmd(context) + ["--sync"],
         }
 
     @classmethod

diff --git a/mkosi/installer/zypper.py b/mkosi/installer/zypper.py
index 7bd43a0223d1aced446c0da15f6c1d50390225d2..f6328663730d3c3ab966e74a93d6f901a3b4443c 100644 (file)
--- a/mkosi/installer/zypper.py
+++ b/mkosi/installer/zypper.py
@@ -39,9 +39,10 @@ class Zypper(PackageManager):
         return {
             "zypper": apivfs_cmd(context.root) + cls.cmd(context),
             "rpm"   : apivfs_cmd(context.root) + rpm_cmd(context),
-            "mkosi-install": apivfs_cmd(context.root) + cls.cmd(context) + install,
-            "mkosi-upgrade": apivfs_cmd(context.root) + cls.cmd(context) + ["update"],
-            "mkosi-remove" : apivfs_cmd(context.root) + cls.cmd(context) + ["remove", "--clean-deps"],
+            "mkosi-install"  : apivfs_cmd(context.root) + cls.cmd(context) + install,
+            "mkosi-upgrade"  : apivfs_cmd(context.root) + cls.cmd(context) + ["update"],
+            "mkosi-remove"   : apivfs_cmd(context.root) + cls.cmd(context) + ["remove", "--clean-deps"],
+            "mkosi-reinstall": apivfs_cmd(context.root) + cls.cmd(context) + install + ["--force"],
         }
 
     @classmethod

diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md
index 4197ba87c56cf3bb2e1c91c8632fc75b1940a9e1..5dca296ac2dd046492e4aaf4da03d0c4f29c167e 100644 (file)
--- a/mkosi/resources/mkosi.md
+++ b/mkosi/resources/mkosi.md
@@ -1988,9 +1988,9 @@ available via `$PATH` to simplify common usecases.
   the host system. This means that from a script, you can do e.g. `dnf
   install vim` to install vim into the image.
 
-  Additionally, `mkosi-install`, `mkosi-upgrade` and `mkosi-remove` will
-  invoke the corresponding operation of the package manager being used
-  to built the image.
+  Additionally, `mkosi-install`, `mkosi-reinstall`, `mkosi-upgrade` and
+  `mkosi-remove` will invoke the corresponding operation of the package
+  manager being used to built the image.
 
 * `mkosi-as-caller`: This script uses `setpriv` to switch from
   the user `root` in the user namespace used for various build steps