From 57ce280b158f9cafc8c285dd3676fbde8262eef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Tue, 14 Feb 2023 06:02:15 +0000
Subject: [PATCH] casper: remove ubuntu's net images load on empty livefs.
---
.../DATA/casper/remove_interactive_netmount.patch | 15 +++++++++++++++
helpers/make-casper | 9 ++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
create mode 100644 helpers/DATA/casper/remove_interactive_netmount.patch
diff --git a/helpers/DATA/casper/remove_interactive_netmount.patch b/helpers/DATA/casper/remove_interactive_netmount.patch
new file mode 100644
index 00000000..fe2dbb55
--- /dev/null
+++ b/helpers/DATA/casper/remove_interactive_netmount.patch
@@ -0,0 +1,15 @@
+--- a/scripts/casper 2022-05-30 09:40:38.000000000 -0500
++++ b/scripts/casper 2023-02-13 23:47:27.515797105 -0600
+@@ -955,12 +955,6 @@
+ sleep 1
+ i="$(($i + 1))"
+ done
+-
+- if [ -z "${livefs_root}" ]; then
+- if do_interactive_netmount ; then
+- livefs_root="${mountpoint}"
+- fi
+- fi
+ fi
+
+ if [ -z "${livefs_root}" ]; then
diff --git a/helpers/make-casper b/helpers/make-casper
index da827929..a6b43ca7 100644
--- a/helpers/make-casper
+++ b/helpers/make-casper
@@ -1,6 +1,7 @@
#!/bin/sh
#
-# Copyright (C) 2012-2022 Ruben Rodriguuez <ruben@trisquel.info>
+# Copyright (C) 2012-2022 Ruben Rodriguez <ruben@trisquel.info>
+# Copyright (C) 2023 Luis Guzmán <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=15
+VERSION=16
. ./config
@@ -42,7 +43,9 @@ sed 's/Depends:/Depends: localechooser-data,\n/' -i debian/control
sed "s/cut/cut -d: -f2- | cut/" -i scripts/casper-functions
sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions
+#Remove ubuntu's net images load on empty livefs.
+patch -p1 < $DATA/remove_interactive_netmount.patch
+
changelog "Compiled for Trisquel"
compile
-
--
GitLab