curtin-dev team mailing list archive

[Michael Hudson-Doyle <mp+433683@xxxxxxxxxxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:swap-exit into curtin:master.

Commit message:
fix "curtin swap" exit code

Today I discovered that there is a "curtin swap" command that just does
the "configure swap" part of curthooks and then I fairly quickly after
that discovered that probably noone has used it because it
unconditionally exits with code 2 even if everything succeeded.



Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/433683
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:swap-exit into curtin:master.

diff --git a/curtin/commands/swap.py b/curtin/commands/swap.py
index 089cd73..a5082ac 100644
--- a/curtin/commands/swap.py
+++ b/curtin/commands/swap.py
@@ -41,7 +41,7 @@ def swap_main(args):
     swap.setup_swapfile(target=state['target'], fstab=state['fstab'],
                         swapfile=args.swapfile, size=size,
                         maxsize=args.maxsize, force=args.force)
-    sys.exit(2)
+    sys.exit(0)
 
 
 CMD_ARGUMENTS = (