Skip to contentSkip to conversation

Hide issue and hostname menu when using a custom skeleton.

PATCH New Sagaert Johan 4 participants 5 messages Jan 13, 2013 – Jan 5, 2014

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Hide issue and hostname menu when using a custom skeleton.

Only show hostname and issue options when the default skeleton is selected. Moved the menu sections so that when a custom skeleton is selected the issue and hostname options are hidden.

---
v2 : Only hide issue and hostname menu when a custom skeleton is selected.

 system/Config.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
system/Config.in +12 -12
index 69863c4..5b38cae 100644
@@ -1,17 +1,5 @@
 menu "System configuration"
 
-config BR2_TARGET_GENERIC_HOSTNAME
-       string "System hostname"
-       default "buildroot"
-       help
-         Select system hostname to be stored in /etc/hostname.
-
-config BR2_TARGET_GENERIC_ISSUE
-       string "System banner"
-       default "Welcome to Buildroot"
-       help
-         Select system banner (/etc/issue) to be displayed at login.
-
 choice
 	bool "Passwords encoding"
 	default BR2_TARGET_GENERIC_PASSWD_MD5
@@ -173,6 +161,18 @@ endif
 
 if BR2_ROOTFS_SKELETON_DEFAULT
 
+config BR2_TARGET_GENERIC_HOSTNAME
+       string "System hostname"
+       default "buildroot"
+       help
+         Select system hostname to be stored in /etc/hostname.
+
+config BR2_TARGET_GENERIC_ISSUE
+       string "System banner"
+       default "Welcome to Buildroot"
+       help
+         Select system banner (/etc/issue) to be displayed at login.
+
 config BR2_TARGET_GENERIC_ROOT_PASSWD
 	string "Root password"
 	default ""
Signature · 1 line
1.8.0.1
#1 lore raw

PATCH v2 1/1 Hide issue and hostname menu when using a custom skeleton.

Gustavo, Yann, Thomas, Arnout,

What do you think of the below patch?

My main concern is that it handles the case of /etc/issue and /etc/hostname, but I see potentially other "System configuration" parameters that may conflict with a custom skeleton.

Thoughts?

Thomas

Quoted 53 lines · Sagaert Johan

Only show hostname and issue options when the default skeleton is selected. Moved the menu sections so that when a custom skeleton is selected the issue and hostname options are hidden.

---
v2 : Only hide issue and hostname menu when a custom skeleton is selected.

 system/Config.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
system/Config.in +12 -12
index 69863c4..5b38cae 100644
@@ -1,17 +1,5 @@
 menu "System configuration"
 
-config BR2_TARGET_GENERIC_HOSTNAME
-       string "System hostname"
-       default "buildroot"
-       help
-         Select system hostname to be stored in /etc/hostname.
-
-config BR2_TARGET_GENERIC_ISSUE
-       string "System banner"
-       default "Welcome to Buildroot"
-       help
-         Select system banner (/etc/issue) to be displayed at login.
-
 choice
 	bool "Passwords encoding"
 	default BR2_TARGET_GENERIC_PASSWD_MD5
@@ -173,6 +161,18 @@ endif
 
 if BR2_ROOTFS_SKELETON_DEFAULT
 
+config BR2_TARGET_GENERIC_HOSTNAME
+       string "System hostname"
+       default "buildroot"
+       help
+         Select system hostname to be stored in /etc/hostname.
+
+config BR2_TARGET_GENERIC_ISSUE
+       string "System banner"
+       default "Welcome to Buildroot"
+       help
+         Select system banner (/etc/issue) to be displayed at login.
+
 config BR2_TARGET_GENERIC_ROOT_PASSWD
 	string "Root password"
 	default ""
Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 Hide issue and hostname menu when using a custom skeleton.

Thomas, All,

On 2013-08-14 00:11 +0200, Thomas Petazzoni spake thusly:

Quoted 3 lines

Gustavo, Yann, Thomas, Arnout,

What do you think of the below patch?

I think the idea behind the patch is valid.

However, I've not teted it, so I can't say if the patch is OK or not. With a simple look at system/system.mk, it seems it would work as expected.

Quoted 5 lines

My main concern is that it handles the case of /etc/issue and /etc/hostname, but I see potentially other "System configuration" parameters that may conflict with a custom skeleton.

Thoughts?

I'd say, we should take it, and if some other "System configuration" items need to be guarded behind BR2_ROOTFS_SKELETON_DEFAULT, we can still move them later when the need arises.

Quoted 64 lines

Thomas

Quoted 53 lines · Sagaert Johan

Only show hostname and issue options when the default skeleton is selected. Moved the menu sections so that when a custom skeleton is selected the issue and hostname options are hidden.

---
v2 : Only hide issue and hostname menu when a custom skeleton is selected.

 system/Config.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
system/Config.in +12 -12
index 69863c4..5b38cae 100644
@@ -1,17 +1,5 @@
 menu "System configuration"
 
-config BR2_TARGET_GENERIC_HOSTNAME
-       string "System hostname"
-       default "buildroot"
-       help
-         Select system hostname to be stored in /etc/hostname.
-
-config BR2_TARGET_GENERIC_ISSUE
-       string "System banner"
-       default "Welcome to Buildroot"
-       help
-         Select system banner (/etc/issue) to be displayed at login.
-
 choice
 	bool "Passwords encoding"
 	default BR2_TARGET_GENERIC_PASSWD_MD5
@@ -173,6 +161,18 @@ endif
 
 if BR2_ROOTFS_SKELETON_DEFAULT
 
+config BR2_TARGET_GENERIC_HOSTNAME
+       string "System hostname"
+       default "buildroot"
+       help
+         Select system hostname to be stored in /etc/hostname.
+
+config BR2_TARGET_GENERIC_ISSUE
+       string "System banner"
+       default "Welcome to Buildroot"
+       help
+         Select system banner (/etc/issue) to be displayed at login.
+
 config BR2_TARGET_GENERIC_ROOT_PASSWD
 	string "Root password"
 	default ""
Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH v2 1/1 Hide issue and hostname menu when using a custom skeleton.

In reply to Thomas Petazzoni
Quoted 9 lines · Thomas Petazzoni

Gustavo, Yann, Thomas, Arnout,

What do you think of the below patch?

My main concern is that it handles the case of /etc/issue and /etc/hostname, but I see potentially other "System configuration" parameters that may conflict with a custom skeleton.

Thoughts?

+1 to what Yann said.
Haven't tested it's working properly yet but the principle is fine. The "Root FS skeleton" option should probably be moved to the top, otherwise a lower option is afecting top ones - a hierarchy/look thing. Regards.

#4 lore raw

PATCH v2 1/1 Hide issue and hostname menu when using a custom skeleton.

In reply to Sagaert Johan

Sagaert, All,

On 2013-01-13 19:39 +0100, Sagaert Johan spake thusly:

Quoted 3 lines

Only show hostname and issue options when the default skeleton is selected. Moved the menu sections so that when a custom skeleton is selected the issue and hostname options are hidden.

After fiddling with the idea, I believe we should not do it that way.

It can well happen that a custom skeleton does not already have an hostname or issue file, and we may want to create either or both in this case.

So I think we should do it differently:

config BR2_TARGET_GENERIC_HOSTNAME
string "System hostname"
default "buildroot" if BR2_ROOTFS_SKELETON_DEFAULT
default "" if ! BR2_ROOTFS_SKELETON_DEFAULT
help
Select system hostname to be stored in /etc/hostname. Leave empty to not create /etc/hostname, or to keep the one from a custom skeleton.

And system/system.mk already ensures we do not create /etc/hostname if BR2_TARGET_GENERIC_HOSTNAME is empty.

That way, the default is correct in both cases, and it is still possible to create/override hostname and issue for a custom skeleton.

(Ditto for /etc/issue).

Thoughts?

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'