Re: motd update

[Dylan Reinhold <dylan@xxxxxxxxxxxxxxxx>]

onflybsd.org> <401ecf9d$0$183$415eb37d@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
In-Reply-To: <401ecf9d$0$183$415eb37d@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Content-Type: multipart/mixed;
 boundary="------------090402090509030300080001"
Lines: 62
Message-ID: <401ee202$0$181$415eb37d@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
NNTP-Posting-Host: 68.4.231.87
X-Trace: 1075765762 crater_reader.dragonflybsd.org 181 68.4.231.87
Xref: crater_reader.dragonflybsd.org dragonfly.submit:689

This is a multi-part message in MIME format.
--------------090402090509030300080001
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Robert Garrett wrote:

> Dylan Reinhold wrote:
> 
> 
>>>
>>>committed
>>
>>Robert the diff did not apply properly, the current file in cvs is
>>broken... Do you want me to send you another diff on the broken version?
>>
>>Thanks,
>>Dylan
> 
> yes

Ok here is a diff from the version in cvs to the working one..

Dylan

--------------090402090509030300080001
Content-Type: text/plain;
 name="motd.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="motd.diff"

Index: motd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/motd,v
retrieving revision 1.6
diff -u -r1.6 motd
--- motd        1 Feb 2004 03:32:08 -0000       1.6
+++ motd        2 Feb 2004 23:44:45 -0000
@@ -28,8 +28,8 @@
        if [ ! -f /etc/motd ]; then
                install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd
        fi
-       T1='mktem -t motd'
-       awk 'NR == 1{if ($1 == "DragonFly") {print} else {exit 1}}' < /etc/motd > $t1 && {
+       T1=`mktemp -t motd`
+       awk 'NR == 1{if ($1 == "DragonFly") {print} else {exit 1}}' < /etc/motd > $T1 && {

         T2=`mktemp -t motd`
         uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T2}
@@ -40,7 +40,7 @@
                        rm -f $T2
                }
        }
-       rm -f $T
+       rm -f $T1
 }
 load_rc_config $name
 run_rc_command "$1"

--------------090402090509030300080001--