Annotation of /trunk/nxserver-freenx/patches/nxserver-freenx-0.5.0-nxsetup-override.patch
Parent Directory | Revision Log
Revision 151 -
(hide annotations)
(download)
Tue May 8 20:26:14 2007 UTC (17 years, 4 months ago) by niro
File size: 1674 byte(s)
Tue May 8 20:26:14 2007 UTC (17 years, 4 months ago) by niro
File size: 1674 byte(s)
-moved to patches subdir
1 | niro | 151 | diff -Naur freenx-0.5.0.orig/nxsetup freenx-0.5.0/nxsetup |
2 | --- freenx-0.5.0.orig/nxsetup 2006-07-07 20:31:35.000000000 -0700 | ||
3 | +++ freenx-0.5.0/nxsetup 2006-08-27 23:19:40.000000000 -0700 | ||
4 | @@ -24,6 +24,7 @@ | ||
5 | BUILD_KNOWN_HOSTS="yes" | ||
6 | AUTOMATIC="no" | ||
7 | IGNORE_ERRORS="no" | ||
8 | +OVERRIDE="no" | ||
9 | |||
10 | while [ "$1" ] | ||
11 | do | ||
12 | @@ -41,6 +42,7 @@ | ||
13 | --uninstall) UNINSTALL="yes"; shift ;; | ||
14 | --purge) PURGE="yes"; shift ;; | ||
15 | --auto) AUTOMATIC="yes"; shift ;; | ||
16 | + --override) OVERRIDE="yes"; shift ;; | ||
17 | --) shift ; break ;; | ||
18 | *) echo "Invalid flag $1" ; HELP="yes"; shift ; break ;; | ||
19 | esac | ||
20 | @@ -54,7 +56,7 @@ | ||
21 | [ "$UNINSTALL" = "yes" -a "$CLEAN" = "yes" ] && HELP="yes" | ||
22 | [ "$SETUP_SSH2_KEY" = "yes" -a "$SETUP_NOMACHINE_KEY" = "no" ] && HELP="yes" | ||
23 | |||
24 | -if [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" -a "$AUTOMATIC" = "no" -a "$HELP" = "no" ] | ||
25 | +if [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" -a "$AUTOMATIC" = "no" -a "$HELP" = "no" -a "$OVERRIDE" = "yes" ] | ||
26 | then | ||
27 | echo "------> You did select no action." | ||
28 | echo " FreeNX guesses that you want to _install_ the server." | ||
29 | @@ -70,6 +72,20 @@ | ||
30 | |||
31 | [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" ] && HELP="yes" | ||
32 | |||
33 | +if [ "$OVERRIDE" = "no" ] | ||
34 | +then | ||
35 | + echo "Your FreeNX server was already setup and configured by the RPM." | ||
36 | + echo | ||
37 | + echo "You should only need to copy the client.id_dsa.key from /etc/nxserver to your client," | ||
38 | + echo "then properly import the key into the client setup. Only proceed with nxsetup if you" | ||
39 | + echo "know exactly what you are doing." | ||
40 | + echo | ||
41 | + echo "To bypass this message, add the following to the nxsetup arguments:" | ||
42 | + echo " --override" | ||
43 | + echo | ||
44 | + exit 0 | ||
45 | +fi | ||
46 | + | ||
47 | if [ "$HELP" = "yes" ] | ||
48 | then | ||
49 | echo "nxsetup - Setup the FreeNX server." |