Re: [Trisquel-devel] [PATCH v2 1/2] Add fai-server package helper

2021-09-20 Thread Pablo Correa Gomez
I think this is much better and ready for the MR, thank you for fixing
it!

This patch would also be helpful in nabia, so I'll create a MR with the
corresponding changes to also help maintainability long-term.

On Mon, 2021-09-20 at 02:36 +0200, Denis 'GNUtoo' Carikli wrote:
> The sources.list has been extracted from a Trisquel livecd and
> a whitespace issue was fixed along the way.
> 
> BugLink: https://trisquel.info/en/issues/28007
> Signed-off-by: Denis 'GNUtoo' Carikli 
> ---
>  helpers/DATA/fai-server/sources.list | 13 +++
>  helpers/make-fai-server  | 33
> 
>  2 files changed, 46 insertions(+)
>  create mode 100644 helpers/DATA/fai-server/sources.list
>  create mode 100644 helpers/make-fai-server
> 
> diff --git a/helpers/DATA/fai-server/sources.list b/helpers/DATA/fai-
> server/sources.list
> new file mode 100644
> index 000..5b5bf6c
> --- /dev/null
> +++ b/helpers/DATA/fai-server/sources.list
> @@ -0,0 +1,13 @@
> +# Trisquel repositories for supported software and updates
> +
> +deb https://archive.trisquel.info/trisquel etiona main
> +#deb-src https://archive.trisquel.info/trisquel etiona main
> +
> +deb https://archive.trisquel.info/trisquel etiona-updates main
> +#deb-src https://archive.trisquel.info/trisquel etiona-updates main
> +
> +deb https://archive.trisquel.info/trisquel etiona-security main
> +#deb-src https://archive.trisquel.info/trisquel etiona-security main
> +
> +#deb https://archive.trisquel.info/trisquel etiona-backports main
> +#deb-src https://archive.trisquel.info/trisquel etiona-backports
> main
> diff --git a/helpers/make-fai-server b/helpers/make-fai-server
> new file mode 100644
> index 000..770e6fc
> --- /dev/null
> +++ b/helpers/make-fai-server
> @@ -0,0 +1,33 @@
> +#!/bin/sh
> +#
> +#Copyright (C) 2021 Denis 'GNUtoo' Carikli <
> [email protected]>
> +#
> +#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
> +#the Free Software Foundation; either version 2 of the License,
> or
> +#(at your option) any later version.
> +#
> +#This program is distributed in the hope that it will be useful,
> +#but WITHOUT ANY WARRANTY; without even the implied warranty of
> +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +#GNU General Public License for more details.
> +#
> +#You should have received a copy of the GNU General Public
> License
> +#along with this program; if not, write to the Free Software
> +#Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> MA  02110-1301 USA
> +#
> +
> +VERSION=1
> +
> +. ./config
> +
> +cp $DATA/sources.list conf/sources.list
> +
> +sed 's#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP="etiona 
> http://archive.trisquel.info/trisquel"#' \
> +-i conf/nfsroot.conf
> +
> +sed 's/linux-image-server/linux-image-generic/g' -i conf/NFSROOT
> +
> +changelog "Replace Ubuntu sources.list, packages repository url and
> specific packages by Trisquel's"
> +
> +compile

___
Trisquel-devel mailing list
[email protected]
https://listas.trisquel.info/mailman/listinfo/trisquel-devel


[Trisquel-devel] [PATCH v2 1/2] Add fai-server package helper

2021-09-19 Thread Denis 'GNUtoo' Carikli
The sources.list has been extracted from a Trisquel livecd and
a whitespace issue was fixed along the way.

BugLink: https://trisquel.info/en/issues/28007
Signed-off-by: Denis 'GNUtoo' Carikli 
---
 helpers/DATA/fai-server/sources.list | 13 +++
 helpers/make-fai-server  | 33 
 2 files changed, 46 insertions(+)
 create mode 100644 helpers/DATA/fai-server/sources.list
 create mode 100644 helpers/make-fai-server

diff --git a/helpers/DATA/fai-server/sources.list 
b/helpers/DATA/fai-server/sources.list
new file mode 100644
index 000..5b5bf6c
--- /dev/null
+++ b/helpers/DATA/fai-server/sources.list
@@ -0,0 +1,13 @@
+# Trisquel repositories for supported software and updates
+
+deb https://archive.trisquel.info/trisquel etiona main
+#deb-src https://archive.trisquel.info/trisquel etiona main
+
+deb https://archive.trisquel.info/trisquel etiona-updates main
+#deb-src https://archive.trisquel.info/trisquel etiona-updates main
+
+deb https://archive.trisquel.info/trisquel etiona-security main
+#deb-src https://archive.trisquel.info/trisquel etiona-security main
+
+#deb https://archive.trisquel.info/trisquel etiona-backports main
+#deb-src https://archive.trisquel.info/trisquel etiona-backports main
diff --git a/helpers/make-fai-server b/helpers/make-fai-server
new file mode 100644
index 000..770e6fc
--- /dev/null
+++ b/helpers/make-fai-server
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+#Copyright (C) 2021 Denis 'GNUtoo' Carikli 
+#
+#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
+#the Free Software Foundation; either version 2 of the License, or
+#(at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+cp $DATA/sources.list conf/sources.list
+
+sed 's#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP="etiona 
http://archive.trisquel.info/trisquel"#' \
+-i conf/nfsroot.conf
+
+sed 's/linux-image-server/linux-image-generic/g' -i conf/NFSROOT
+
+changelog "Replace Ubuntu sources.list, packages repository url and specific 
packages by Trisquel's"
+
+compile
-- 
2.33.0

___
Trisquel-devel mailing list
[email protected]
https://listas.trisquel.info/mailman/listinfo/trisquel-devel